aijinhui
2023-09-26 39a88b3fd870ad8a65f356561b42d465c4f2fc42
设备健康列表
已修改2个文件
16 ■■■■■ 文件已修改
ard-work/src/main/java/com/ruoyi/health/controller/HealthController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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);
                }
            }
        }
    }