From 01f4050c3529f85ec05673fea9273f35c6e5e934 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.30>
Date: 星期三, 05 十二月 2018 14:04:40 +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