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();