From b2eef36c70808fa5b39b3987edd2a757ab3bb281 Mon Sep 17 00:00:00 2001 From: fl <3098731433@qq.com> Date: Mon, 2 Dec 2024 18:29:26 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=9E=B6=E6=9E=84=E8=80=83?= =?UTF-8?q?=E5=8B=A4=E8=A7=84=E5=88=99=E4=BF=AE=E6=94=B9=E4=BA=8C=E6=AC=A1?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/system/basic/controller/SysUserController.java | 1 - .../bonus/system/basic/service/impl/SysUserServiceImpl.java | 6 ++++++ 2 files changed, 6 insertions(+), 1 deletion(-) 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 ea3c282..5241e6b 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 @@ -188,7 +188,6 @@ 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()); 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 8bb7728..823d997 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 @@ -73,6 +73,12 @@ public class SysUserServiceImpl implements SysUserService //角色集合 List orgList = userMapper.getOrgByUserId(sysUser); sysUser.setOrgList(orgList); + // 获取考勤组 + List attGroupList = userMapper.getAttGroupByUserId(sysUser); + if(!attGroupList.isEmpty()){ + sysUser.setAttGroupId(attGroupList.get(0).getId()); + sysUser.setAttGroupName(attGroupList.get(0).getName()); + } // 权限集合 Set permissions = sysMenuService.getMenuPermission(sysUser); LoginUser sysUserVo = new LoginUser();