添加节点类型、标签等

xm-core/src/main/java/com/xm/core/ctrl/XmMenuController.java

@@ -104,11 +104,16 @@ public class XmMenuController {
 				}
 				pidPathsSet.add(pidPaths);
 			}
+
+			if(pidPathsSet!=null && pidPathsSet.size()>0){
 				List<Map<String,Object>> parentList=xmMenuService.selectListMapByWhere(map("pidPathsList",pidPathsSet.stream().collect(Collectors.toList())));
 				parentList=parentList.stream().filter(i->!idSet.contains(i.get("menuId"))).collect(Collectors.toList());
+				if(parentList!=null && parentList.size()>0){
 					xmMenuList.addAll(parentList);
 					m.put("total", NumberUtil.getInteger(m.get("total"),0)+parentList.size());
 				}
+			}
+		}
 		m.put("data",xmMenuList);
 		Tips tips=new Tips("查询成功");
 		m.put("tips", tips);
@@ -153,11 +158,15 @@ public class XmMenuController {
 				}
 				pidPathsSet.add(pidPaths);
 			}
+			if(pidPathsSet!=null && pidPathsSet.size()>0){
 				List<Map<String,Object>> parentList=xmMenuService.selectListMapByWhereWithState(map("pidPathsList",pidPathsSet.stream().collect(Collectors.toList())));
 				parentList=parentList.stream().filter(i->!idSet.contains(i.get("menuId"))).collect(Collectors.toList());
+				if(parentList!=null && parentList.size()>0){
 					xmMenuList.addAll(parentList);
 					m.put("total", NumberUtil.getInteger(m.get("total"),0)+parentList.size());
 				}
+			}
+		}
 
 			m.put("data",xmMenuList);  
 		m.put("tips", tips);
@@ -184,11 +193,15 @@ public class XmMenuController {
 					String pidPaths= (String) map.get("pidPaths");
 					pidPathsSet.add(PubTool.getPidPaths(pidPaths,id));
 				}
- 				List<Map<String,Object>> parentList=xmMenuService.selectListMapByWhereWithPlan(map("projectId",xmMenu.get("projectId"),"pidPathsList",pidPathsSet.stream().collect(Collectors.toList())));
+				if(pidPathsSet!=null && pidPathsSet.size()>0){
+					List<Map<String,Object>> parentList=xmMenuService.selectListMapByWhereWithPlan(map("pidPathsList",pidPathsSet.stream().collect(Collectors.toList())));
 					parentList=parentList.stream().filter(i->!idSet.contains(i.get("menuId"))).collect(Collectors.toList());
+					if(parentList!=null && parentList.size()>0){
 						xmMenuList.addAll(parentList);
 						m.put("total", NumberUtil.getInteger(m.get("total"),0)+parentList.size());
 					}
+				}
+			}
 			m.put("data",xmMenuList);
 		}
 

xm-core/src/main/java/com/xm/core/ctrl/XmProjectPhaseController.java

@@ -130,11 +130,15 @@ public class XmProjectPhaseController {
 				}
 				pidPathsSet.add(pidPaths);
 			}
+			if(pidPathsSet!=null && pidPathsSet.size()>0){
 				List<Map<String,Object>> parentList=xmProjectPhaseService.selectListMapByWhere(map("pidPathsList",pidPathsSet.stream().collect(Collectors.toList())));
 				parentList=parentList.stream().filter(i->!idSet.contains(i.get("id"))).collect(Collectors.toList());
+				if(parentList!=null && parentList.size()>0){
 					xmProjectPhaseList.addAll(parentList);
 					m.put("total", NumberUtil.getInteger(m.get("total"),0)+parentList.size());
 				}
+			}
+		}
 		m.put("data",xmProjectPhaseList);
 		Tips tips=new Tips("查询成功");
 		m.put("tips", tips);

xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java

@@ -155,11 +155,15 @@ public class XmTaskController {
 				}
 				pidPathsSet.add(pidPaths);
 			}
+			if(pidPathsSet!=null && pidPathsSet.size()>0){
 				List<Map<String,Object>> parentList=xmTaskService.getTask(map("pidPathsList",pidPathsSet.stream().collect(Collectors.toList())));
 				parentList=parentList.stream().filter(i->!idSet.contains(i.get("id"))).collect(Collectors.toList());
+				if(parentList!=null && parentList.size()>0){
 					xmTaskVoList.addAll(parentList);
 					m.put("total", NumberUtil.getInteger(m.get("total"),0)+parentList.size());
 				}
+			}
+		}
 
 		m.put("data",xmTaskVoList);
 		Tips tips=new Tips("查询成功");
@@ -252,12 +256,17 @@ public class XmTaskController {
 					}
 					pidPathsSet.add(pidPaths);
 				}
+
+				if(pidPathsSet!=null && pidPathsSet.size()>0){
 					List<Map<String,Object>> parentList=xmTaskService.getTask(map("pidPathsList",pidPathsSet.stream().collect(Collectors.toList())));
 					parentList=parentList.stream().filter(i->!idSet.contains(i.get("id"))).collect(Collectors.toList());
+					if(parentList!=null && parentList.size()>0){
 						xmTaskVoList.addAll(parentList);
 						m.put("total", NumberUtil.getInteger(m.get("total"),0)+parentList.size());
 					}
 				}
+			}
+		}