From 9ba77f85d56a4a52d5a7b57c9747dd96ee6f1ba6 Mon Sep 17 00:00:00 2001
From: 军 <军@hp-pc>
Date: 星期六, 29 九月 2018 19:01:14 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
index c1666c3..855d1e8 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
@@ -355,8 +355,8 @@
baseSql+=station1SqlF;
}
//鐢ㄤ簬缁存姢鍖�
- String station2SqlT=" stationname2!=? ";//鍏ㄩ儴
- String station2SqlF=" stationname2=? ";
+ String station2SqlT=" and stationname2!=? ";//鍏ㄩ儴
+ String station2SqlF=" and stationname2=? ";
if(binf.getStationName2().equals("")){
baseSql+=station2SqlT;
}else{
--
Gitblit v1.9.1