From 2d10f00422f1c501f2cffec29fef1c6a8eba3a55 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期三, 31 一月 2024 13:57:44 +0800
Subject: [PATCH] 禁出电子围栏报警逻辑bug修改提交
---
ard-work/src/main/java/com/ruoyi/health/controller/HealthController.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/health/controller/HealthController.java b/ard-work/src/main/java/com/ruoyi/health/controller/HealthController.java
index f844901..8e4e345 100644
--- a/ard-work/src/main/java/com/ruoyi/health/controller/HealthController.java
+++ b/ard-work/src/main/java/com/ruoyi/health/controller/HealthController.java
@@ -84,6 +84,7 @@
List<TreeDeptWell> treeDeptWells = new ArrayList<>();
if ((int) mapResult.get("code") == 200) {
List<Map<String, Object>> listResult = (List<Map<String, Object>>) JSON.parse((String) mapResult.get("resdata"));
+// System.out.println(String.valueOf(listResult));
//寰幆寰楀埌鏉冮檺涓嬪尮閰嶆暟鎹�
for (int i = 0; i < listResult.size(); i++) {
String equipNumber = (String) listResult.get(i).get("EquipNumber");
@@ -164,7 +165,7 @@
//濡傛灉璇ョ埗绫婚泦鍚堝湪缁撴瀯涓凡缁忓瓨鍦ㄥ苟涓斾笉鏄澶囨暟鎹氨涓嶇敤閲嶅娣诲姞浜�
Long treeId = treeDeptWells.get(l).getDeptId();
Integer id = treeDeptWells.get(l).getId();
- if(ancestor.equals(treeId)){
+ if(ancestor.equals(treeId) && id==null){
wellTrue = true;
}
}
--
Gitblit v1.9.3