From c17dc5484bde25d032bf58d114a4f1598a301f31 Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: 星期三, 08 五月 2024 10:29:52 +0800
Subject: [PATCH] 增加用户预览位置接口
---
ard-work/src/main/java/com/ruoyi/health/controller/HealthController.java | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 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..92642cd 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;
}
}
@@ -182,13 +183,17 @@
}
}
}
- List<TreeDeptWell> tree = sysDeptService.wellTree(treeDeptWells);
- TreeSelectWellJson treeSelectWellJson = new TreeSelectWellJson();
- treeSelectWellJson.setWellList(tree);
- treeSelectWellJson.setCount0(count0);
- treeSelectWellJson.setCount1(count1);
- treeSelectWellJson.setCount2(count2);
- return Results.succeed(treeSelectWellJson);
+ if(treeDeptWells.size()>0){
+ List<TreeDeptWell> tree = sysDeptService.wellTree(treeDeptWells);
+ TreeSelectWellJson treeSelectWellJson = new TreeSelectWellJson();
+ treeSelectWellJson.setWellList(tree);
+ treeSelectWellJson.setCount0(count0);
+ treeSelectWellJson.setCount1(count1);
+ treeSelectWellJson.setCount2(count2);
+ return Results.succeed(treeSelectWellJson);
+ }else {
+ return Results.error("鏃犲尮閰嶆暟鎹�");
+ }
} else {
//閿欒鎻愮ず
return Results.error((String) mapResult.get("errmsg"));
--
Gitblit v1.9.3