From b6e8fdb6f9bb50d29aeb29aa62b19a75c9a1ef9d Mon Sep 17 00:00:00 2001 From: hdw <496960745@qq.com> Date: 星期五, 02 十一月 2018 17:31:23 +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/Battalarm_dataDAOImpl.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/gx_tieta/src/com/fgkj/dao/impl/Battalarm_dataDAOImpl.java b/gx_tieta/src/com/fgkj/dao/impl/Battalarm_dataDAOImpl.java index f2406db..6e02453 100644 --- a/gx_tieta/src/com/fgkj/dao/impl/Battalarm_dataDAOImpl.java +++ b/gx_tieta/src/com/fgkj/dao/impl/Battalarm_dataDAOImpl.java @@ -1310,7 +1310,7 @@ " where db_user.tb_user_battgroup_baojigroup_battgroup.BattGroupId=db_battinf.tb_battinf.BattGroupId " + " and db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id=db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id " + " and db_user.tb_user_inf.uid=db_user.tb_user_battgroup_baojigroup_usr.uid " + - " and db_user.tb_user_inf.uid=? and db_battinf.tb_battinf.stationname like ? ) " + + " and db_user.tb_user_inf.uid=? and db_battinf.tb_battinf.stationname like ? and tb_battinf.station_install=1 ) " + " GROUP BY(alm_id) "; sql+=citySql; //System.out.println(sql); -- Gitblit v1.9.1