增加企业用户接口查询,无权限控制的用户分页列表
parent
646ee4785b
commit
31403f1906
|
|
@ -72,9 +72,9 @@ public class UserController {
|
|||
}
|
||||
|
||||
@ApiOperation("其他页面的用户分页,不需要权限控制")
|
||||
@PostMapping("/PageByNopermission")
|
||||
public PageResponse<UserCO> PageByNopermission(@RequestBody UserPageQry qry) {
|
||||
return userService.PageByNopermission(qry);
|
||||
@PostMapping("/pageByNopermission")
|
||||
public PageResponse<UserCO> pageByNopermission(@RequestBody UserPageQry qry) {
|
||||
return userService.pageByNopermission(qry);
|
||||
}
|
||||
|
||||
@ApiOperation("所有数据")
|
||||
|
|
|
|||
|
|
@ -289,11 +289,11 @@ public class UserQueryExe {
|
|||
|
||||
}
|
||||
|
||||
public PageResponse<UserCO> PageByNopermission(UserPageQry userPageQry) {
|
||||
public PageResponse<UserCO> pageByNopermission(UserPageQry userPageQry) {
|
||||
Map<String, Object> params = PageQueryHelper.toHashMap(userPageQry);
|
||||
UserE userE = new UserE();
|
||||
userE.dataProcessingRights(AuthContext.getTenantId(), params);
|
||||
PageResponse<UserDO> pageResponse = userRepository.PageByNopermission(params);
|
||||
PageResponse<UserDO> pageResponse = userRepository.pageByNopermission(params);
|
||||
List<UserCO> examCenterCOS = userCoConvertor.converDOsToCOs(pageResponse.getData());
|
||||
|
||||
return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex());
|
||||
|
|
|
|||
|
|
@ -225,8 +225,8 @@ public class UserServiceImpl implements UserServiceI {
|
|||
}
|
||||
|
||||
@Override
|
||||
public PageResponse<UserCO> PageByNopermission(UserPageQry qry) {
|
||||
return userQueryExe.PageByNopermission(qry);
|
||||
public PageResponse<UserCO> pageByNopermission(UserPageQry qry) {
|
||||
return userQueryExe.pageByNopermission(qry);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -87,6 +87,7 @@ public interface UserServiceI {
|
|||
|
||||
SingleResponse<UserCO> getUserIdByPhone(GetUserIdByPhoneCmd getUserIdByPhoneCmd);
|
||||
|
||||
PageResponse<UserCO> PageByNopermission(UserPageQry qry);
|
||||
PageResponse<UserCO> pageByNopermission(UserPageQry qry);
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -44,6 +44,6 @@ public interface UserMapper extends BaseMapper<UserDO> {
|
|||
|
||||
UserDO getUserIdByPhone(String phone);
|
||||
|
||||
IPage<UserDO> PageByNopermission(IPage<UserDO> iPage, @Param("ew") QueryWrapper<UserDO> queryWrapper);
|
||||
IPage<UserDO> pageByNopermission(IPage<UserDO> iPage, @Param("ew") QueryWrapper<UserDO> queryWrapper);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -95,6 +95,6 @@ public interface UserRepository extends BaseRepository<UserDO> {
|
|||
|
||||
UserDO getUserIdByPhone(@NotEmpty(message = "手机号不能为空") String phone);
|
||||
|
||||
PageResponse<UserDO> PageByNopermission(Map<String, Object> params);
|
||||
PageResponse<UserDO> pageByNopermission(Map<String, Object> params);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -123,7 +123,7 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserMapper, UserDO> i
|
|||
}
|
||||
|
||||
@Override
|
||||
public PageResponse<UserDO> PageByNopermission(Map<String, Object> params) {
|
||||
public PageResponse<UserDO> pageByNopermission(Map<String, Object> params) {
|
||||
if (params.get("inDepartmentId") != null) {
|
||||
Long[] inDepartmentIds = (Long[]) params.get("inDepartmentId");
|
||||
if (inDepartmentIds == null || inDepartmentIds.length == 0) {
|
||||
|
|
@ -139,7 +139,7 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserMapper, UserDO> i
|
|||
}
|
||||
|
||||
queryWrapper.orderByAsc("u.sort").orderByDesc("u.create_time");
|
||||
IPage<UserDO> result = userMapper.PageByNopermission(iPage, queryWrapper);
|
||||
IPage<UserDO> result = userMapper.pageByNopermission(iPage, queryWrapper);
|
||||
return PageHelper.pageToResponse(result, result.getRecords());
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -170,7 +170,7 @@
|
|||
left join post p on p.id = u.post_id
|
||||
${ew.customSqlSegment}
|
||||
</select>
|
||||
<select id="PageByNopermission" resultType="com.zcloud.basic.info.persistence.dataobject.UserDO">
|
||||
<select id="pageByNopermission" resultType="com.zcloud.basic.info.persistence.dataobject.UserDO">
|
||||
select
|
||||
d.name as department_name,
|
||||
p.post_name,
|
||||
|
|
|
|||
Loading…
Reference in New Issue