mirror of https://gitee.com/xiaonuobase/snowy
【更新】后端升级如下: 1、人员、机构、角色、岗位选择器list接口全部升级为page分页接口 2、userCenter控制器增加人员、机构、角色、岗位已选择的字符串数组查询对象数组的接口
parent
3411bb602e
commit
352bf642ba
|
@ -311,7 +311,7 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
|
|||
SysUser::getName, SysUser::getSortCode, SysUser::getGender, SysUser::getEntryDate);
|
||||
// 如果查询条件为空,则直接查询
|
||||
if(ObjectUtil.isAllEmpty(sysOrgSelectorUserParam.getOrgId(), sysOrgSelectorUserParam.getSearchKey())) {
|
||||
return sysUserService.getCachedAllUserSelectorList();
|
||||
return sysUserService.getAllUserSelectorList();
|
||||
} else {
|
||||
if(ObjectUtil.isNotEmpty(sysOrgSelectorUserParam.getOrgId())) {
|
||||
// 如果组织id不为空,则查询该组织所在顶级组织下的所有人
|
||||
|
|
|
@ -457,7 +457,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
|
|||
SysUser::getName, SysUser::getSortCode, SysUser::getGender, SysUser::getEntryDate);
|
||||
// 如果查询条件为空,则直接查询
|
||||
if(ObjectUtil.isAllEmpty(sysRoleSelectorUserParam.getOrgId(), sysRoleSelectorUserParam.getSearchKey())) {
|
||||
return sysUserService.getCachedAllUserSelectorList();
|
||||
return sysUserService.getAllUserSelectorList();
|
||||
} else {
|
||||
if (ObjectUtil.isNotEmpty(sysRoleSelectorUserParam.getOrgId())) {
|
||||
// 如果机构id不为空,则查询该机构所在顶级机构下的所有人
|
||||
|
|
|
@ -1498,7 +1498,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
|||
SysUser::getName, SysUser::getSortCode, SysUser::getGender, SysUser::getEntryDate);
|
||||
// 如果查询条件为空,则直接查询
|
||||
if(ObjectUtil.isAllEmpty(sysUserSelectorUserParam.getOrgId(), sysUserSelectorUserParam.getSearchKey())) {
|
||||
return this.getCachedAllUserSelectorList();
|
||||
return this.getAllUserSelectorList();
|
||||
} else {
|
||||
if (ObjectUtil.isNotEmpty(sysUserSelectorUserParam.getOrgId())) {
|
||||
// 如果机构id不为空,则查询该机构所在顶级机构下的所有人
|
||||
|
|
Loading…
Reference in New Issue