From 270f724b990f5ee26b0238ceb3f89095552611fc Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 16 十二月 2024 19:54:15 +0800
Subject: [PATCH] 小型微波设备管理接口

---
 medicalWaste-system/src/main/java/com/sinata/system/service/impl/SysUserServiceImpl.java |   11 +++--------
 1 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/medicalWaste-system/src/main/java/com/sinata/system/service/impl/SysUserServiceImpl.java b/medicalWaste-system/src/main/java/com/sinata/system/service/impl/SysUserServiceImpl.java
index a201651..c08b533 100644
--- a/medicalWaste-system/src/main/java/com/sinata/system/service/impl/SysUserServiceImpl.java
+++ b/medicalWaste-system/src/main/java/com/sinata/system/service/impl/SysUserServiceImpl.java
@@ -15,7 +15,6 @@
 import com.sinata.common.utils.StringUtils;
 import com.sinata.common.utils.bean.BeanValidators;
 import com.sinata.common.utils.spring.SpringUtils;
-import com.sinata.system.domain.SysDepartment;
 import com.sinata.system.domain.SysPost;
 import com.sinata.system.domain.SysUserPost;
 import com.sinata.system.domain.SysUserRole;
@@ -573,13 +572,9 @@
      */
     @Override
     public PageDTO<SysUserVO> pageList(SysUserQuery query) {
-        String treeCode = "";
-        if (Objects.isNull(query.getDepartmentId())) {
-            SysDepartment myDepartment = sysDepartmentService.getMyDepartment();
-            if (Objects.isNull(myDepartment)) {
-                return PageDTO.empty(0L, 0L);
-            }
-            treeCode = myDepartment.getTreeCode();
+        String treeCode = sysDepartmentService.getTreeCodeByDepartmentId(query.getDepartmentId());
+        if (StringUtils.isBlank(treeCode)) {
+            return PageDTO.empty(0L, 0L);
         }
         Page<SysUserVO> page = baseMapper.pageList(new Page<>(query.getPageCurr(), query.getPageSize()), query.getDepartmentId(), query.getNickName(), query.getRoleId(), treeCode);
         return PageDTO.of(page);

--
Gitblit v1.7.1