From 6eb6f0949430667648f7adbb5742b76a1b0d1d34 Mon Sep 17 00:00:00 2001
From: LiJun <LiJun@192.168.10.18>
Date: 星期六, 03 十一月 2018 13:28:23 +0800
Subject: [PATCH] 从首页上的机房图标弹出的面板上的落后机房数后的详情定位到落后单体统计分析查询页面中并且选中当前的省,市,区县,机房

---
 gx_tieta/src/com/fgkj/dao/impl/BatttestdatastopDAOImpl.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gx_tieta/src/com/fgkj/dao/impl/BatttestdatastopDAOImpl.java b/gx_tieta/src/com/fgkj/dao/impl/BatttestdatastopDAOImpl.java
index a13256c..95ea981 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/BatttestdatastopDAOImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/BatttestdatastopDAOImpl.java
@@ -480,11 +480,11 @@
 	    			sdata.setNote(binf.getBattProducer());
 	    			for (int j = 0; j < listr.size(); j++) {
 	    				BattInf_Rebuild brinf=(BattInf_Rebuild) listr.get(j);
-						if(sdata.getMon_num()==brinf.getOld_monum()){
+						if(sdata.getMon_num()==brinf.getOld_monum()&&sdata.getBattGroupId()==brinf.getOld_battgroupid()){
 							sdata.setMon_num(-1);
 							break;
 						}
-						if(sdata.getMon_num()==brinf.getNew_monum()){
+						if(sdata.getMon_num()==brinf.getNew_monum()&&sdata.getBattGroupId()==brinf.getNew_battgroupid()){
 							sdata.setNote(brinf.getOld_battproducer());
 							break;
 						}

--
Gitblit v1.9.1