From 4e977986deb786982bb8aa3b8fda255c701ac5e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Sat, 26 Feb 2022 02:08:45 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=8A=82=E7=82=B9=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E3=80=81=E6=A0=87=E7=AD=BE=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- xm-core/src/main/java/com/xm/core/PubTool.java | 3 +++ .../src/main/java/com/xm/core/ctrl/XmMenuController.java | 8 ++++---- .../java/com/xm/core/ctrl/XmProductPhaseController.java | 2 +- .../java/com/xm/core/ctrl/XmProjectGroupController.java | 4 ++-- .../java/com/xm/core/ctrl/XmProjectPhaseController.java | 2 +- .../src/main/java/com/xm/core/ctrl/XmTaskController.java | 2 +- 6 files changed, 12 insertions(+), 9 deletions(-) diff --git a/xm-core/src/main/java/com/xm/core/PubTool.java b/xm-core/src/main/java/com/xm/core/PubTool.java index 78c034f1..b8e8e43b 100644 --- a/xm-core/src/main/java/com/xm/core/PubTool.java +++ b/xm-core/src/main/java/com/xm/core/PubTool.java @@ -8,6 +8,9 @@ import java.util.Set; public class PubTool { public static String getPidPaths(String pidPahts, String trimId){ + if(!StringUtils.hasText(pidPahts)){ + return null; + } int i=pidPahts.indexOf(trimId+","); if(i>0){ return pidPahts.substring(0,i); diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmMenuController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmMenuController.java index d8a0e004..5aeaeb0d 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmMenuController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmMenuController.java @@ -109,7 +109,7 @@ public class XmMenuController { idSet.add(id); String pidPaths= (String) map.get("pidPaths"); pidPaths=PubTool.getPidPaths(pidPaths,id); - if(pidPaths.length()<=2){ + if(pidPaths==null || pidPaths.length()<=2){ continue; } pidPathsSet.add(pidPaths); @@ -163,7 +163,7 @@ public class XmMenuController { idSet.add(id); String pidPaths= (String) map.get("pidPaths"); pidPaths=PubTool.getPidPaths(pidPaths,id); - if(pidPaths.length()<=2){ + if(pidPaths==null || pidPaths.length()<=2){ continue; } pidPathsSet.add(pidPaths); @@ -214,7 +214,7 @@ public class XmMenuController { idSet.add(id); String pidPaths= (String) map.get("pidPaths"); pidPaths=PubTool.getPidPaths(pidPaths,id); - if(pidPaths.length()<=2){ + if(pidPaths==null || pidPaths.length()<=2){ continue; } pidPathsSet.add(pidPaths); @@ -267,7 +267,7 @@ public class XmMenuController { idSet.add(id); String pidPaths= (String) map.get("pidPaths"); pidPaths=PubTool.getPidPaths(pidPaths,id); - if(pidPaths.length()<=2){ + if(pidPaths==null || pidPaths.length()<=2){ continue; } pidPathsSet.add(pidPaths); diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmProductPhaseController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProductPhaseController.java index 0288cb50..8758de5e 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmProductPhaseController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProductPhaseController.java @@ -127,7 +127,7 @@ public class XmProductPhaseController { idSet.add(id); String pidPaths= (String) map.get("pidPaths"); pidPaths=PubTool.getPidPaths(pidPaths,id); - if(pidPaths.length()<=2){ + if(pidPaths==null || pidPaths.length()<=2){ continue; } pidPathsSet.add(pidPaths); diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectGroupController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectGroupController.java index e1e0bfb0..eec019cc 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectGroupController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectGroupController.java @@ -145,8 +145,8 @@ public class XmProjectGroupController { @ApiResponses({ @ApiResponse(code = 200,response=XmProjectGroup.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}") }) - @HasQx(value = "xm_core_xmProjectGroup_getGroup",name = "查找项目团队信息",categoryId = "admin-xm",categoryName = "管理端-项目管理系统") - @RequestMapping(value="/getGroup",method=RequestMethod.GET) + @HasQx(value = "xm_core_xmProjectGroup_getGroups",name = "查找项目团队信息",categoryId = "admin-xm",categoryName = "管理端-项目管理系统") + @RequestMapping(value="/getGroups",method=RequestMethod.GET) public Map getGroup(@RequestParam Map params) { Map m = new HashMap<>(); RequestUtils.transformArray(params, "ids"); diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectPhaseController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectPhaseController.java index deae551c..98f12730 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectPhaseController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectPhaseController.java @@ -124,7 +124,7 @@ public class XmProjectPhaseController { idSet.add(id); String pidPaths= (String) map.get("pidPaths"); pidPaths=PubTool.getPidPaths(pidPaths,id); - if(pidPaths.length()<=2){ + if(pidPaths==null || pidPaths.length()<=2){ continue; } pidPathsSet.add(pidPaths); diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java index 5c8d5886..c647041b 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java @@ -153,7 +153,7 @@ public class XmTaskController { idSet.add(id); String pidPaths= (String) map.get("pidPaths"); pidPaths=PubTool.getPidPaths(pidPaths,id); - if(pidPaths.length()<=2){ + if(pidPaths==null || pidPaths.length()<=2){ continue; } pidPathsSet.add(pidPaths);