|
|
@@ -17,6 +17,7 @@ import com.qmth.themis.business.entity.TBUser;
|
|
|
import com.qmth.themis.business.entity.TBUserRole;
|
|
|
import com.qmth.themis.business.enums.FieldUniqueEnum;
|
|
|
import com.qmth.themis.business.enums.MqTagEnum;
|
|
|
+import com.qmth.themis.business.enums.RoleEnum;
|
|
|
import com.qmth.themis.business.enums.SystemOperationEnum;
|
|
|
import com.qmth.themis.business.service.*;
|
|
|
import com.qmth.themis.business.util.*;
|
|
|
@@ -560,7 +561,6 @@ public class TBUserController {
|
|
|
return ResultUtil.ok(true);
|
|
|
}
|
|
|
|
|
|
- // @CachePut(value = "user_cache", key = "'userCacheQuery'")
|
|
|
@ApiOperation(value = "用户查询接口")
|
|
|
@RequestMapping(value = "/query", method = RequestMethod.POST)
|
|
|
@ApiResponses({@ApiResponse(code = 200, message = "用户信息", response = TBUserDto.class)})
|
|
|
@@ -573,8 +573,11 @@ public class TBUserController {
|
|
|
@ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) int pageNumber,
|
|
|
@ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) int pageSize) {
|
|
|
TBUser tbUser = (TBUser) ServletUtil.getRequestAccount();
|
|
|
- IPage<TBUserDto> tbUserIPage = tbUserService
|
|
|
- .userQuery(new Page<>(pageNumber, pageSize), id, loginName, name, roleCode, enable, tbUser.getOrgId(), orgName);
|
|
|
+ AuthDto authDto = cacheService.addAccountAuthCache(tbUser.getId());
|
|
|
+ if (authDto.getRoleCodes().toString().contains(RoleEnum.SUPER_ADMIN.name())) {
|
|
|
+ roleCode = Objects.isNull(roleCode) ? RoleEnum.ADMIN.name() : roleCode;
|
|
|
+ }
|
|
|
+ IPage<TBUserDto> tbUserIPage = tbUserService.userQuery(new Page<>(pageNumber, pageSize), id, loginName, name, roleCode, enable, tbUser.getOrgId(), orgName);
|
|
|
tbUserIPage.getRecords().forEach(s -> {
|
|
|
if (Objects.nonNull(s.getRoleNameStr())) {
|
|
|
s.setRoleName(Arrays.asList(s.getRoleNameStr().split(",")));
|
wangliang