From 4f79561c3fe827dd96a1a5e5d517c3f1d03348c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Thu, 1 Feb 2024 14:52:22 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=97=A0=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E6=97=B6=E6=9F=A5=E8=AF=A2=E9=A1=B9=E7=9B=AE=E3=80=81=E4=BA=A7?= =?UTF-8?q?=E5=93=81=E5=88=97=E8=A1=A8=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/xm/core/ctrl/XmProductController.java | 11 +++++++++-- .../java/com/xm/core/ctrl/XmProjectController.java | 10 ++++++++-- 2 files changed, 17 insertions(+), 4 deletions(-) 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());