From fe85c3bb5c63c8016af04b839db3a83c851f3f9e Mon Sep 17 00:00:00 2001 From: gaoqr <13665037151@163.com> Date: Tue, 6 Aug 2024 19:06:00 +0800 Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86bug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9B1=E3=80=81mvc=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E4=B8=8D=E6=AD=A3=E7=A1=AE=E7=9B=B4=E6=8E=A5?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=EF=BC=8C=E4=B8=8D=E6=8F=90=E7=A4=BA"?= =?UTF-8?q?=E8=AF=B7=E6=B1=82=E5=8F=82=E6=95=B0=E4=B8=8D=E6=AD=A3=E7=A1=AE?= =?UTF-8?q?"=EF=BC=8C=E4=BC=98=E5=8C=96=E6=89=8B=E6=9C=BA=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E4=B8=8D=E6=AD=A3=E7=A1=AE=E7=9A=84=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=EF=BC=9B2=E3=80=81=E6=96=B0=E5=A2=9E=E6=9C=BA=E6=9E=84?= =?UTF-8?q?=E4=B8=8D=E8=87=AA=E5=8A=A8=E7=94=9F=E6=88=90=E6=9C=BA=E6=9E=84?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=EF=BC=9B3=E3=80=81=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=88=97=E8=A1=A8=E7=AD=9B=E9=80=89=E7=99=BB?= =?UTF-8?q?=E9=99=86=E7=94=A8=E6=88=B7=E6=9C=AC=E8=BA=AB=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cf/imes/framework/common/validation/Mobile.java | 2 +- .../security/core/util/SecurityFrameworkUtils.java | 5 ++++- .../framework/web/core/handler/GlobalExceptionHandler.java | 2 +- .../module/system/controller/admin/user/UserController.java | 6 +++++- .../imes/module/system/service/organ/OrganServiceImpl.java | 1 - 5 files changed, 11 insertions(+), 5 deletions(-) diff --git a/cf-framework/cf-common/src/main/java/com/cf/imes/framework/common/validation/Mobile.java b/cf-framework/cf-common/src/main/java/com/cf/imes/framework/common/validation/Mobile.java index 3bfa34000..7d089476d 100644 --- a/cf-framework/cf-common/src/main/java/com/cf/imes/framework/common/validation/Mobile.java +++ b/cf-framework/cf-common/src/main/java/com/cf/imes/framework/common/validation/Mobile.java @@ -19,7 +19,7 @@ import java.lang.annotation.*; ) public @interface Mobile { - String message() default "手机号格式不正确"; + String message() default "手机号格式不正确，请重新确认"; Class[] groups() default {}; diff --git a/cf-framework/cf-spring-boot-starter-security/src/main/java/com/cf/imes/framework/security/core/util/SecurityFrameworkUtils.java b/cf-framework/cf-spring-boot-starter-security/src/main/java/com/cf/imes/framework/security/core/util/SecurityFrameworkUtils.java index 930d975dd..48cfd8025 100644 --- a/cf-framework/cf-spring-boot-starter-security/src/main/java/com/cf/imes/framework/security/core/util/SecurityFrameworkUtils.java +++ b/cf-framework/cf-spring-boot-starter-security/src/main/java/com/cf/imes/framework/security/core/util/SecurityFrameworkUtils.java @@ -90,7 +90,10 @@ public class SecurityFrameworkUtils { @Nullable public static Long getLoginUserId() { LoginUser loginUser = getLoginUser(); - return loginUser != null ? loginUser.getId() : null; + if (loginUser == null) { + throw new ServiceException(GlobalErrorCodeConstants.UNAUTHORIZED); + } + return loginUser.getId(); } /** diff --git a/cf-framework/cf-spring-boot-starter-web/src/main/java/com/cf/imes/framework/web/core/handler/GlobalExceptionHandler.java b/cf-framework/cf-spring-boot-starter-web/src/main/java/com/cf/imes/framework/web/core/handler/GlobalExceptionHandler.java index 5b734fe73..91cb6e04d 100644 --- a/cf-framework/cf-spring-boot-starter-web/src/main/java/com/cf/imes/framework/web/core/handler/GlobalExceptionHandler.java +++ b/cf-framework/cf-spring-boot-starter-web/src/main/java/com/cf/imes/framework/web/core/handler/GlobalExceptionHandler.java @@ -124,7 +124,7 @@ public class GlobalExceptionHandler { log.warn("[methodArgumentNotValidExceptionExceptionHandler]", ex); FieldError fieldError = ex.getBindingResult().getFieldError(); assert fieldError != null; // 断言，避免告警 - return CommonResult.error(BAD_REQUEST.getCode(), String.format("请求参数不正确:%s", fieldError.getDefaultMessage())); + return CommonResult.error(BAD_REQUEST.getCode(), fieldError.getDefaultMessage()); } /** diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/user/UserController.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/user/UserController.java index 7113f5c2b..9c2c98474 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/user/UserController.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/user/UserController.java @@ -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> 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 deptMap = deptService.getDeptMap( convertList(pageResult.getList(), AdminUserDO::getDeptId)); diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/organ/OrganServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/organ/OrganServiceImpl.java index 0857310fc..e2c08f560 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/organ/OrganServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/organ/OrganServiceImpl.java @@ -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