Merge branch 'develop' into dev/nurse20210421

cdssman-service/src/main/java/com/diagbot/facade/KlRelationFacade.java

@@ -45,36 +45,37 @@ public class KlRelationFacade extends KlRelationServiceImpl {
         relationVO.setRId(pList.get(index)[1]);
         relationVO.setEType(pList.get(index)[2]);
         List<RelationDTO> root = this.getRelations(relationVO);
+        TreeAllDTO treeAllDTO = new TreeAllDTO();
+        treeAllDTO.setTypes(types);
 
-        RelationVO relationVO2 = new RelationVO();
-        relationVO2.setSType(pList.get(index)[2]);
-        relationVO2.setRId(pList.get(index)[3]);
-        relationVO2.setEType(pList.get(index)[4]);
-        List<RelationDTO> sub = this.getRelations(relationVO2);
-        Map<Long, List<RelationDTO>> map = EntityUtil.makeEntityListMap(sub, "sId");
+        if (ListUtil.isNotEmpty(root)) {
+            RelationVO relationVO2 = new RelationVO();
+            relationVO2.setSType(pList.get(index)[2]);
+            relationVO2.setRId(pList.get(index)[3]);
+            relationVO2.setEType(pList.get(index)[4]);
+            List<RelationDTO> sub = this.getRelations(relationVO2);
+            Map<Long, List<RelationDTO>> map = EntityUtil.makeEntityListMap(sub, "sId");
 
-        TreeDTO treeDTO = new TreeDTO();
-        treeDTO.setId(root.get(0).getSId());
-        treeDTO.setName(root.get(0).getSName());
-        for (RelationDTO relationDTO : root) {
-            TreeDTO treeDTO2 = new TreeDTO();
-            treeDTO2.setId(relationDTO.getEId());
-            treeDTO2.setName(relationDTO.getEName());
-            List<RelationDTO> e = map.get(relationDTO.getEId());
-            if (ListUtil.isNotEmpty(e)) {
-                for (RelationDTO relationDTO1 : e) {
-                    TreeDTO treeDTO3 = new TreeDTO();
-                    treeDTO3.setId(relationDTO1.getEId());
-                    treeDTO3.setName(relationDTO1.getEName());
-                    treeDTO2.getNextTree().add(treeDTO3);
+            TreeDTO treeDTO = new TreeDTO();
+            treeDTO.setId(root.get(0).getSId());
+            treeDTO.setName(root.get(0).getSName());
+            for (RelationDTO relationDTO : root) {
+                TreeDTO treeDTO2 = new TreeDTO();
+                treeDTO2.setId(relationDTO.getEId());
+                treeDTO2.setName(relationDTO.getEName());
+                List<RelationDTO> e = map.get(relationDTO.getEId());
+                if (ListUtil.isNotEmpty(e)) {
+                    for (RelationDTO relationDTO1 : e) {
+                        TreeDTO treeDTO3 = new TreeDTO();
+                        treeDTO3.setId(relationDTO1.getEId());
+                        treeDTO3.setName(relationDTO1.getEName());
+                        treeDTO2.getNextTree().add(treeDTO3);
+                    }
                 }
+                treeDTO.getNextTree().add(treeDTO2);
             }
-            treeDTO.getNextTree().add(treeDTO2);
+            treeAllDTO.setTreeDTO(treeDTO);
         }
-
-        TreeAllDTO treeAllDTO = new TreeAllDTO();
-        treeAllDTO.setTypes(types);
-        treeAllDTO.setTreeDTO(treeDTO);
         return treeAllDTO;
     }
 }