ard-work/src/main/java/com/ruoyi/health/controller/HealthController.java
@@ -164,7 +164,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; } } ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
@@ -397,13 +397,15 @@ private void recursionFnWell(List<TreeDeptWell> list, TreeDeptWell t) { // 得到子节点列表 List<TreeDeptWell> childList = getChildListWell(list, t); t.setChildren(childList); for (TreeDeptWell tChild : childList) { if (hasChildWell(list, tChild)) if(t.getId() == null){ List<TreeDeptWell> childList = getChildListWell(list, t); t.setChildren(childList); for (TreeDeptWell tChild : childList) { recursionFnWell(list, tChild); if (hasChildWell(list, tChild)) { recursionFnWell(list, tChild); } } } }