From 0a8119461bea9b913819d302b8820f1dc2cf420c Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 07 一月 2025 17:07:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
medicalWaste-system/src/main/java/com/sinata/system/service/impl/SysUserServiceImpl.java | 4 +++-
1 files changed, 3 insertions(+), 1 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 e3afc94..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
@@ -576,7 +576,7 @@
if (StringUtils.isBlank(treeCode)) {
return PageDTO.empty(0L, 0L);
}
- Page<SysUserVO> page = baseMapper.pageList(new Page<>(query.getPageCurr(), query.getPageSize()), 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);
}
@@ -641,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