From a4f1d4cd325f9ae6a2879dd5e53ac189fe6d1677 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期六, 29 九月 2018 17:44:29 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@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