组织架构考勤规则修改二次提交
This commit is contained in:
parent
44dbbc0052
commit
b2eef36c70
|
|
@ -188,7 +188,6 @@ public class SysUserController extends BaseController {
|
|||
List<MapVo> orgList = userService.getOrgByUserId(user);
|
||||
user.setOrgList(orgList);
|
||||
// 获取考勤组
|
||||
|
||||
List<MapVo> attGroupList = userService.getAttGroupByUserId(user);
|
||||
if(!attGroupList.isEmpty()){
|
||||
user.setAttGroupId(attGroupList.get(0).getId());
|
||||
|
|
|
|||
|
|
@ -73,6 +73,12 @@ public class SysUserServiceImpl implements SysUserService
|
|||
//角色集合
|
||||
List<MapVo> orgList = userMapper.getOrgByUserId(sysUser);
|
||||
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);
|
||||
LoginUser sysUserVo = new LoginUser();
|
||||
|
|
|
|||
Loading…
Reference in New Issue