From 20e289e496f52ed686e0656e95970743eb898d60 Mon Sep 17 00:00:00 2001 From: fl <3098731433@qq.com> Date: Wed, 4 Dec 2024 17:45:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E4=BF=A1=E6=81=AF=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E8=80=83=E5=8B=A4=E7=BB=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/system/basic/controller/SysUserController.java | 6 ++++++ .../java/com/bonus/system/basic/service/SysUserService.java | 2 ++ .../bonus/system/basic/service/impl/SysUserServiceImpl.java | 5 +++++ 3 files changed, 13 insertions(+) diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/controller/SysUserController.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/controller/SysUserController.java index 1ec9908..12063e3 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/controller/SysUserController.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/controller/SysUserController.java @@ -201,6 +201,12 @@ public class SysUserController extends BaseController { // 组织集合 List orgList = userService.getOrgByUserId(user); user.setOrgList(orgList); + // 获取考勤组 + List attGroupList = userService.getAttGroupByUserId(user); + if(!attGroupList.isEmpty()){ + user.setAttGroupId(attGroupList.get(0).getId()); + user.setAttGroupName(attGroupList.get(0).getName()); + } // 角色集合 Set roles = sysMenuService.getRolePermission(user); // 权限集合 diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/service/SysUserService.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/service/SysUserService.java index 4f8dbdb..c8ef6b5 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/service/SysUserService.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/service/SysUserService.java @@ -140,4 +140,6 @@ public interface SysUserService { AjaxResult updateIsFace(SysUser user); int checkPersonAssignment(SysUser bean); + + List getAttGroupByUserId(SysUser user); } diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/service/impl/SysUserServiceImpl.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/service/impl/SysUserServiceImpl.java index a5bb6c1..91aee5b 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/service/impl/SysUserServiceImpl.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/service/impl/SysUserServiceImpl.java @@ -226,6 +226,11 @@ public class SysUserServiceImpl implements SysUserService return userMapper.checkPersonAssignment(bean); } + @Override + public List getAttGroupByUserId(SysUser user) { + return userMapper.getAttGroupByUserId(user); + } + @Override @Transactional(rollbackFor = Exception.class) public int deleteUserByIds(Long userId) {