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) {