From 35fefed0792c40cb99b8d15fa5811bbb5992bff9 Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139>
Date: 星期一, 21 一月 2019 10:42:24 +0800
Subject: [PATCH] 修改

---
 gx_tieta/src/com/fgkj/dao/impl/BadBatt_monImpl.java |    6 +++---
 1 files changed, 3 insertions(+), 3 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..37a388e 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/BadBatt_monImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/BadBatt_monImpl.java
@@ -155,7 +155,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_user.tb_user_inf.uid=? and db_battinf.tb_battinf.Station_install=1 ) " ;
 		//System.out.println(sql);
 		List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{uinf.getUId()}, new CallBack() {
 			
@@ -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