diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmProductController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProductController.java index c948ad0f..1f18434f 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmProductController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProductController.java @@ -185,8 +185,15 @@ public class XmProductController { params.put("linkBranchId",user.getBranchId()); QueryTools.alias(params,"branchId res.branchId"); QueryWrapper qw = QueryTools.initQueryWrapper(XmProduct.class , params); - Dept dept=deptRedisCacheService.getDept(user.getDeptid()); - params.put("myIdPath",dept.getIdPath()); + + if(!StringUtils.isEmpty(user.getDeptid())){ + Dept dept=deptRedisCacheService.getDept(user.getDeptid()); + if(dept==null){ + params.put("myIdPath",""); + }else{ + params.put("myIdPath",dept.getIdPath()); + } + } params.put("myDeptid",user.getDeptid()); params.put("myBranchId",user.getBranchId()); params.put("myUserid",user.getUserid()); diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectController.java index 4af4441e..46490451 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectController.java @@ -123,9 +123,15 @@ public class XmProjectController { params.put("platformBranchId",platformBranchId); QueryTools.alias(params,"branchId res.branchId"); QueryWrapper qw = QueryTools.initQueryWrapper(XmProject.class , params); + if(!StringUtils.isEmpty(user.getDeptid())){ + Dept dept=deptRedisCacheService.getDept(user.getDeptid()); + if(dept==null){ + params.put("myIdPath",""); + }else{ + params.put("myIdPath",dept.getIdPath()); + } - Dept dept=deptRedisCacheService.getDept(user.getDeptid()); - params.put("myIdPath",dept.getIdPath()); + } params.put("myDeptid",user.getDeptid()); params.put("myBranchId",user.getBranchId()); params.put("myUserid",user.getUserid());