From 4d6a225f961db7760e5c25dd6adf847fbeb57aca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B1=88=E5=B1=95=E8=88=AA?= <2426745133@qq.com> Date: Thu, 11 Dec 2025 16:38:31 +0800 Subject: [PATCH] =?UTF-8?q?12-11-=E6=9D=83=E9=99=90=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=EF=BC=8C=E6=8E=92=E9=99=A4SuperAdmin?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../XzdProjectManagerApprovalServiceImpl.java | 22 ++++++++++--------- .../service/impl/XzdProjectServiceImpl.java | 20 +++++++++-------- .../impl/XzdSupplierInfoServiceImpl.java | 22 ++++++++++--------- 3 files changed, 35 insertions(+), 29 deletions(-) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdProjectManagerApprovalServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdProjectManagerApprovalServiceImpl.java index d4b8b9d2..3c5e276c 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdProjectManagerApprovalServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdProjectManagerApprovalServiceImpl.java @@ -74,17 +74,19 @@ public class XzdProjectManagerApprovalServiceImpl extends ServiceImpl queryPageList(XzdProjectManagerApprovalBo bo, PageQuery pageQuery) { // 获取当前用户部门 - Long deptId = LoginHelper.getDeptId(); - SysDeptVo deptVo = iSysDeptService.selectDeptById(deptId); - if (LoginHelper.isSuperAdmin()) { - bo.setSsgs(deptVo.getDeptId()); - }else { - String ancestors = deptVo.getAncestors(); - List ids = StringUtils.splitTo(ancestors, Convert::toLong); - if (ids.size() == 2) { + if (!LoginHelper.isSuperAdmin()) { + Long deptId = LoginHelper.getDeptId(); + SysDeptVo deptVo = iSysDeptService.selectDeptById(deptId); + if (LoginHelper.isSuperAdmin()) { bo.setSsgs(deptVo.getDeptId()); - }else { - bo.setSsgs(iSysDeptService.selectDeptById(ids.get(2)).getDeptId()); + } else { + String ancestors = deptVo.getAncestors(); + List ids = StringUtils.splitTo(ancestors, Convert::toLong); + if (ids.size() == 2) { + bo.setSsgs(deptVo.getDeptId()); + } else { + bo.setSsgs(iSysDeptService.selectDeptById(ids.get(2)).getDeptId()); + } } } LambdaQueryWrapper lqw = buildQueryWrapper(bo); diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdProjectServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdProjectServiceImpl.java index b92ee61b..90b718da 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdProjectServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdProjectServiceImpl.java @@ -115,17 +115,19 @@ public class XzdProjectServiceImpl extends ServiceImpl ids = StringUtils.splitTo(ancestors, Convert::toLong); - if (ids.size() == 2) { + if (!LoginHelper.isSuperAdmin()) { + Long deptId = LoginHelper.getDeptId(); + SysDeptVo deptVo = iSysDeptService.selectDeptById(deptId); + if (LoginHelper.isSuperAdmin()) { bo.setSsgs(deptVo.getDeptId()); } else { - bo.setSsgs(iSysDeptService.selectDeptById(ids.get(2)).getDeptId()); + String ancestors = deptVo.getAncestors(); + List ids = StringUtils.splitTo(ancestors, Convert::toLong); + if (ids.size() == 2) { + bo.setSsgs(deptVo.getDeptId()); + } else { + bo.setSsgs(iSysDeptService.selectDeptById(ids.get(2)).getDeptId()); + } } } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdSupplierInfoServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdSupplierInfoServiceImpl.java index f1584cfb..8842d486 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdSupplierInfoServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdSupplierInfoServiceImpl.java @@ -136,17 +136,19 @@ public class XzdSupplierInfoServiceImpl extends ServiceImpl ids = StringUtils.splitTo(ancestors, Convert::toLong); - if (ids.size() == 2) { + if (!LoginHelper.isSuperAdmin()) { + Long deptId = LoginHelper.getDeptId(); + SysDeptVo deptVo = iSysDeptService.selectDeptById(deptId); + if (LoginHelper.isSuperAdmin()) { bo.setSsgs(deptVo.getDeptId()); - }else { - bo.setSsgs(iSysDeptService.selectDeptById(ids.get(2)).getDeptId()); + } else { + String ancestors = deptVo.getAncestors(); + List ids = StringUtils.splitTo(ancestors, Convert::toLong); + if (ids.size() == 2) { + bo.setSsgs(deptVo.getDeptId()); + } else { + bo.setSsgs(iSysDeptService.selectDeptById(ids.get(2)).getDeptId()); + } } }