From 7c533d448acabda7ec92d75757d760b447e41f00 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Wed, 20 Dec 2023 14:53:46 +0800
Subject: [PATCH] 单元展示排序

---
 src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
index 6dc569d..0cc5984 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
@@ -123,7 +123,8 @@
 	@Override
 	public boolean updateUserInfo(User user) {
 		user.setPassword(null);
-		return updateById(user);
+		boolean b = updateById(user);
+		return b;
 	}
 
 	private boolean submitUserDept(User user) {
@@ -136,11 +137,15 @@
 			userDeptList.add(userDept);
 		});
 		userDeptService.remove(Wrappers.<UserDept>update().lambda().eq(UserDept::getUserId, user.getId()));
-		return userDeptService.saveBatch(userDeptList);
+		boolean b = userDeptService.saveBatch(userDeptList);
+		return b;
 	}
 
 	@Override
 	public IPage<User> selectUserPage(IPage<User> page, User user, Long deptId, String tenantId) {
+		if (null == deptId && !AuthUtil.isAdministrator()){
+			deptId = Long.parseLong(AuthUtil.getDeptId());
+		}
 		List<Long> deptIdList = SysCache.getDeptChildIds(deptId);
 		return page.setRecords(baseMapper.selectUserPage(page, user, deptIdList, tenantId));
 	}

--
Gitblit v1.9.3