Browse Source

添加节点类型、标签等

master
陈裕财 4 years ago
parent
commit
4e977986de
  1. 3
      xm-core/src/main/java/com/xm/core/PubTool.java
  2. 8
      xm-core/src/main/java/com/xm/core/ctrl/XmMenuController.java
  3. 2
      xm-core/src/main/java/com/xm/core/ctrl/XmProductPhaseController.java
  4. 4
      xm-core/src/main/java/com/xm/core/ctrl/XmProjectGroupController.java
  5. 2
      xm-core/src/main/java/com/xm/core/ctrl/XmProjectPhaseController.java
  6. 2
      xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java

3
xm-core/src/main/java/com/xm/core/PubTool.java

@ -8,6 +8,9 @@ import java.util.Set;
public class PubTool { public class PubTool {
public static String getPidPaths(String pidPahts, String trimId){ public static String getPidPaths(String pidPahts, String trimId){
if(!StringUtils.hasText(pidPahts)){
return null;
}
int i=pidPahts.indexOf(trimId+","); int i=pidPahts.indexOf(trimId+",");
if(i>0){ if(i>0){
return pidPahts.substring(0,i); return pidPahts.substring(0,i);

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

@ -109,7 +109,7 @@ public class XmMenuController {
idSet.add(id); idSet.add(id);
String pidPaths= (String) map.get("pidPaths"); String pidPaths= (String) map.get("pidPaths");
pidPaths=PubTool.getPidPaths(pidPaths,id); pidPaths=PubTool.getPidPaths(pidPaths,id);
if(pidPaths.length()<=2){
if(pidPaths==null || pidPaths.length()<=2){
continue; continue;
} }
pidPathsSet.add(pidPaths); pidPathsSet.add(pidPaths);
@ -163,7 +163,7 @@ public class XmMenuController {
idSet.add(id); idSet.add(id);
String pidPaths= (String) map.get("pidPaths"); String pidPaths= (String) map.get("pidPaths");
pidPaths=PubTool.getPidPaths(pidPaths,id); pidPaths=PubTool.getPidPaths(pidPaths,id);
if(pidPaths.length()<=2){
if(pidPaths==null || pidPaths.length()<=2){
continue; continue;
} }
pidPathsSet.add(pidPaths); pidPathsSet.add(pidPaths);
@ -214,7 +214,7 @@ public class XmMenuController {
idSet.add(id); idSet.add(id);
String pidPaths= (String) map.get("pidPaths"); String pidPaths= (String) map.get("pidPaths");
pidPaths=PubTool.getPidPaths(pidPaths,id); pidPaths=PubTool.getPidPaths(pidPaths,id);
if(pidPaths.length()<=2){
if(pidPaths==null || pidPaths.length()<=2){
continue; continue;
} }
pidPathsSet.add(pidPaths); pidPathsSet.add(pidPaths);
@ -267,7 +267,7 @@ public class XmMenuController {
idSet.add(id); idSet.add(id);
String pidPaths= (String) map.get("pidPaths"); String pidPaths= (String) map.get("pidPaths");
pidPaths=PubTool.getPidPaths(pidPaths,id); pidPaths=PubTool.getPidPaths(pidPaths,id);
if(pidPaths.length()<=2){
if(pidPaths==null || pidPaths.length()<=2){
continue; continue;
} }
pidPathsSet.add(pidPaths); pidPathsSet.add(pidPaths);

2
xm-core/src/main/java/com/xm/core/ctrl/XmProductPhaseController.java

@ -127,7 +127,7 @@ public class XmProductPhaseController {
idSet.add(id); idSet.add(id);
String pidPaths= (String) map.get("pidPaths"); String pidPaths= (String) map.get("pidPaths");
pidPaths=PubTool.getPidPaths(pidPaths,id); pidPaths=PubTool.getPidPaths(pidPaths,id);
if(pidPaths.length()<=2){
if(pidPaths==null || pidPaths.length()<=2){
continue; continue;
} }
pidPathsSet.add(pidPaths); pidPathsSet.add(pidPaths);

4
xm-core/src/main/java/com/xm/core/ctrl/XmProjectGroupController.java

@ -145,8 +145,8 @@ public class XmProjectGroupController {
@ApiResponses({ @ApiResponses({
@ApiResponse(code = 200,response=XmProjectGroup.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}") @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<String,Object> getGroup(@RequestParam Map<String,Object> params) { public Map<String,Object> getGroup(@RequestParam Map<String,Object> params) {
Map<String,Object> m = new HashMap<>(); Map<String,Object> m = new HashMap<>();
RequestUtils.transformArray(params, "ids"); RequestUtils.transformArray(params, "ids");

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

@ -124,7 +124,7 @@ public class XmProjectPhaseController {
idSet.add(id); idSet.add(id);
String pidPaths= (String) map.get("pidPaths"); String pidPaths= (String) map.get("pidPaths");
pidPaths=PubTool.getPidPaths(pidPaths,id); pidPaths=PubTool.getPidPaths(pidPaths,id);
if(pidPaths.length()<=2){
if(pidPaths==null || pidPaths.length()<=2){
continue; continue;
} }
pidPathsSet.add(pidPaths); pidPathsSet.add(pidPaths);

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

@ -153,7 +153,7 @@ public class XmTaskController {
idSet.add(id); idSet.add(id);
String pidPaths= (String) map.get("pidPaths"); String pidPaths= (String) map.get("pidPaths");
pidPaths=PubTool.getPidPaths(pidPaths,id); pidPaths=PubTool.getPidPaths(pidPaths,id);
if(pidPaths.length()<=2){
if(pidPaths==null || pidPaths.length()<=2){
continue; continue;
} }
pidPathsSet.add(pidPaths); pidPathsSet.add(pidPaths);

Loading…
Cancel
Save