Browse Source

解决无部门时查询项目、产品列表报错问题

master
陈裕财 2 years ago
parent
commit
4f79561c3f
  1. 7
      xm-core/src/main/java/com/xm/core/ctrl/XmProductController.java
  2. 8
      xm-core/src/main/java/com/xm/core/ctrl/XmProjectController.java

7
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<XmProduct> qw = QueryTools.initQueryWrapper(XmProduct.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());
}
}
params.put("myDeptid",user.getDeptid());
params.put("myBranchId",user.getBranchId());
params.put("myUserid",user.getUserid());

8
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<XmProject> 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());
}
}
params.put("myDeptid",user.getDeptid());
params.put("myBranchId",user.getBranchId());
params.put("myUserid",user.getUserid());

Loading…
Cancel
Save