bonus
/
gz_att
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

组织架构考勤规则修改二次提交

This commit is contained in:
fl 2024-12-02 18:29:26 +08:00
parent 44dbbc0052
commit b2eef36c70
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/controller/SysUserController.java
View File

@ -188,7 +188,6 @@ public class SysUserController extends BaseController {
List<MapVo> orgList = userService.getOrgByUserId(user); List<MapVo> orgList = userService.getOrgByUserId(user);
user.setOrgList(orgList); user.setOrgList(orgList);
// 获取考勤组 // 获取考勤组
List<MapVo> attGroupList = userService.getAttGroupByUserId(user); List<MapVo> attGroupList = userService.getAttGroupByUserId(user);
if(!attGroupList.isEmpty()){ if(!attGroupList.isEmpty()){
user.setAttGroupId(attGroupList.get(0).getId()); user.setAttGroupId(attGroupList.get(0).getId());

6
bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/service/impl/SysUserServiceImpl.java
View File

@ -73,6 +73,12 @@ public class SysUserServiceImpl implements SysUserService
//角色集合 //角色集合
List<MapVo> orgList = userMapper.getOrgByUserId(sysUser); List<MapVo> orgList = userMapper.getOrgByUserId(sysUser);
sysUser.setOrgList(orgList); sysUser.setOrgList(orgList);
// 获取考勤组
List<MapVo> attGroupList = userMapper.getAttGroupByUserId(sysUser);
if(!attGroupList.isEmpty()){
sysUser.setAttGroupId(attGroupList.get(0).getId());
sysUser.setAttGroupName(attGroupList.get(0).getName());
}
// 权限集合 // 权限集合
Set<String> permissions = sysMenuService.getMenuPermission(sysUser); Set<String> permissions = sysMenuService.getMenuPermission(sysUser);
LoginUser sysUserVo = new LoginUser(); LoginUser sysUserVo = new LoginUser();