From ffb7bf307d13056bcf244b949cfe2f0ff15e0001 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 12 二月 2025 14:14:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'gitee/master'
---
medicalWaste-system/src/main/java/com/sinata/system/service/impl/SysUserServiceImpl.java | 14 ++++++--------
1 files changed, 6 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 439e870..e448565 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,14 +572,11 @@
*/
@Override
public PageDTO<SysUserVO> pageList(SysUserQuery query) {
- String treeCode = "";
- if (Objects.isNull(query.getDepartmentId())) {
- SysDepartment myDepartment = sysDepartmentService.getMyDepartment();
- if (Objects.nonNull(myDepartment)) {
- 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);
+ Page<SysUserVO> page = baseMapper.pageList(new Page<>(query.getPageCurr(), query.getPageSize()), query.getNickName(), query.getRoleId(), query.getUserName(), treeCode);
return PageDTO.of(page);
}
@@ -645,6 +641,8 @@
*/
@Override
public SysUserVO getDetailInfo(Long userId) {
+ System.out.println("-------------------------------");
+ System.out.println(SecurityUtils.getLoginUser().getUser());
SysUser sysUser = this.getById(userId);
SysUserVO sysUserVO = null;
if (Objects.nonNull(sysUser)) {
--
Gitblit v1.7.1