From d7049dae792f0a6d2ee4246acf4b42bf0b36635c Mon Sep 17 00:00:00 2001 From: Administrator <Administrator@USER-20180117QL> Date: 星期二, 25 十二月 2018 11:11:02 +0800 Subject: [PATCH] Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw --- gx_tieta/src/com/fgkj/dao/impl/BadBatt_monImpl.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gx_tieta/src/com/fgkj/dao/impl/BadBatt_monImpl.java b/gx_tieta/src/com/fgkj/dao/impl/BadBatt_monImpl.java index 04aeb5e..929f9f1 100644 --- a/gx_tieta/src/com/fgkj/dao/impl/BadBatt_monImpl.java +++ b/gx_tieta/src/com/fgkj/dao/impl/BadBatt_monImpl.java @@ -304,8 +304,8 @@ "and db_battinf.tb_battinf.stationname1 like ? and db_battinf.tb_battinf.stationname like ? and db_battinf.tb_battinf.stationname2 like ? and db_battinf.tb_battinf.stationname5 like ? "; //閫夊彇钃勭數姹犵粍鏉′欢 - String idSqlT=" and db_battinf.tb_battinf.battgroupid!=? "; - String idSqlF=" and db_battinf.tb_battinf.battgroupid=? "; + String idSqlT=" and db_battinf.tb_battinf.battgroupid!=? and db_battinf.tb_battinf.Station_install=1 "; + String idSqlF=" and db_battinf.tb_battinf.battgroupid=? and db_battinf.tb_battinf.Station_install=1 "; if(binf.getBattGroupId()==0){ baseSql+=idSqlT; }else{ -- Gitblit v1.9.1