系统管理bug修复;1、mvc参数校验不正确直接提示,不提示"请求参数不正确",优化手机格式不正确的提示;2、新增机构不自动生成机构代码;3、用户管理列表筛选登陆用户本身;

This commit is contained in:
gaoqr
2024-08-06 19:06:00 +08:00
parent f737c17866
commit fe85c3bb5c
5 changed files with 11 additions and 5 deletions
@@ -115,7 +115,6 @@ public class UserController {
@GetMapping("/page")
@Operation(summary = "获得用户分页列表")
// @PreAuthorize("@ss.hasPermission('system:user:list')")
@PreAuthorize("@ss.hasAnyPermissions('system:user:list','base:user:query')")
public CommonResult<PageResult<UserRespVO>> getUserPage(@Valid UserPageReqVO pageReqVO) {
// 获得用户分页列表
@@ -123,6 +122,11 @@ public class UserController {
if (CollUtil.isEmpty(pageResult.getList())) {
return success(new PageResult<>(pageResult.getTotal()));
}
// 用户列表不展示当前登录人
boolean removeCurrentUser = pageResult.getList().removeIf(user -> Objects.equals(user.getId(), SecurityFrameworkUtils.getLoginUserId()));
if (removeCurrentUser) {
pageResult.setTotal(pageResult.getTotal() - 1);
}
// 拼接数据
Map<Long, DeptDO> deptMap = deptService.getDeptMap(
convertList(pageResult.getList(), AdminUserDO::getDeptId));
@@ -128,7 +128,6 @@ public class OrganServiceImpl implements OrganService {
pinyinFull = pinyinFull.replaceAll(" ", "");
}
tenant.setPinyinFull(pinyinFull);
tenant.setCode(StrUtil.isBlank(createReqVO.getCode())? pinyinFull : createReqVO.getCode());
tenant.setLarge(createReqVO.getLarge() == null ? Boolean.FALSE : createReqVO.getLarge());
tenant.setPinyinInitial(PinYinUtils.convertFirstChar(tenant.getName()));
//todo 未来还需要判断是否大客户,大客户有自己dataCode