From 0960e84f87af09990397cb38801bdfd40a2c2d36 Mon Sep 17 00:00:00 2001
From: yubo <autumnal_wind@yeah.net>
Date: 星期五, 27 三月 2026 16:45:10 +0800
Subject: [PATCH] fix(hr): 修复保险提醒年龄范围判断逻辑
---
febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/UserServiceImpl.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/UserServiceImpl.java b/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/UserServiceImpl.java
index bb93e08..85506d6 100644
--- a/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/UserServiceImpl.java
+++ b/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/UserServiceImpl.java
@@ -55,8 +55,9 @@
@Override
public IPage<SystemUser> findUserDetailList(SystemUser user, QueryRequest request) {
Page<SystemUser> page = new Page<>(request.getPageNum(), request.getPageSize());
+ String currentUserId= FebsUtil.getUserId();
SortUtil.handlePageSort(request, page, "userId", FebsConstant.ORDER_ASC, false);
- return this.baseMapper.findUserDetailPage(page, user);
+ return this.baseMapper.findUserDetailPage(page, user, currentUserId);
}
@Override
@@ -92,10 +93,14 @@
save(user);
// 保存用户角色
String[] roles = StringUtils.splitByWholeSeparatorPreserveAllTokens(user.getRoleId(), StringConstant.COMMA);
- setUserRoles(user, roles);
- // 保存用户数据权限关联关系
+ if(roles!=null){
+ setUserRoles(user, roles);
+ }
String[] deptIds = StringUtils.splitByWholeSeparatorPreserveAllTokens(user.getDeptIds(), StringConstant.COMMA);
- setUserDataPermissions(user, deptIds);
+ if(deptIds!=null){
+ // 保存用户数据权限关联关系
+ setUserDataPermissions(user, deptIds);
+ }
}
@Override
--
Gitblit v1.8.0