From 2aa4c5e6420326ea31fd1db60a86f1da970dd627 Mon Sep 17 00:00:00 2001
From: gaoqr <13665037151@163.com>
Date: Tue, 10 Sep 2024 12:03:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=94=A8=E6=88=B7=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E4=B8=AA=E4=BA=BA=E5=AF=86=E7=A0=81=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=EF=BC=8C=E8=A7=A3=E5=86=B3=E9=A6=96=E6=AC=A1=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81=E5=8F=AF=E8=83=BD=E7=9A=84?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/enums/ErrorCodeConstants.java      |  1 +
 .../controller/admin/user/UserController.java | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/enums/ErrorCodeConstants.java b/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/enums/ErrorCodeConstants.java
index 24f7efcae..6c57c3818 100644
--- a/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/enums/ErrorCodeConstants.java
+++ b/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/enums/ErrorCodeConstants.java
@@ -55,6 +55,7 @@ public interface ErrorCodeConstants {
     ErrorCode USERNAME_MULTIPLE_ERROR = new ErrorCode(1_002_003_015,"存在【{}】重复用户，请联系系统管理员");
     ErrorCode USER_OPERATE_SELF_STATUS_ERROR = new ErrorCode(1_002_003_016, "不允许操作用户自身状态");
     ErrorCode THE_PASSWORD_MUST_CONTAIN_AT_LEAST_ONE_UPPER_LETTER = new ErrorCode(1_002_003_017, "密码必须包含至少一个大写字母");
+    ErrorCode PERSONAL_PASSWORD_PERMISSION_ERROR = new ErrorCode(1_002_003_018, "修改密码权限不足");
 
     // ========== 部门模块 1-002-004-000 ==========
     ErrorCode DEPT_NAME_DUPLICATE = new ErrorCode(1_002_004_000, "已经存在该名字的部门");
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 3167c2d1e..9e66a1988 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
@@ -1,7 +1,9 @@
 package com.cf.imes.module.system.controller.admin.user;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.cf.imes.framework.common.enums.CommonStatusEnum;
+import com.cf.imes.framework.common.exception.ServiceException;
 import com.cf.imes.framework.common.pojo.CommonResult;
 import com.cf.imes.framework.common.pojo.PageParam;
 import com.cf.imes.framework.common.pojo.PageResult;
@@ -10,6 +12,8 @@ import com.cf.imes.framework.excel.core.util.ExcelUtils;
 import com.cf.imes.framework.mybatis.core.query.MPJLambdaWrapperX;
 import com.cf.imes.framework.operatelog.core.annotations.OperateLog;
 import com.cf.imes.framework.organ.core.context.OrganContextHolder;
+import com.cf.imes.framework.security.core.LoginUser;
+import com.cf.imes.framework.security.core.util.SecurityFrameworkUtils;
 import com.cf.imes.module.system.controller.admin.user.vo.user.*;
 import com.cf.imes.module.system.controller.admin.user.vo.user.UserImportExcelVO;
 import com.cf.imes.module.system.controller.admin.user.vo.user.UserImportRespVO;
@@ -45,11 +49,13 @@ import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 import static com.cf.imes.framework.common.pojo.CommonResult.success;
 import static com.cf.imes.framework.common.util.collection.CollectionUtils.convertList;
 import static com.cf.imes.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
+import static com.cf.imes.module.system.enums.ErrorCodeConstants.PERSONAL_PASSWORD_PERMISSION_ERROR;
 
 @Tag(name = "管理后台 - 用户")
 @RestController
@@ -101,6 +107,19 @@ public class UserController {
         return success(true);
     }
 
+    @PutMapping("/update-personal-password")
+    @Operation(summary = "重置用户个人密码")
+    public CommonResult<Boolean> updateUserPersonalPassword(@Valid @RequestBody UserUpdatePasswordReqVO reqVO) {
+        // 校验个人
+        LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
+        if (ObjectUtil.isNotNull(loginUser) && Objects.equals(loginUser.getId(), reqVO.getId())) {
+            userService.updateUserPassword(reqVO.getId(), reqVO.getPassword());
+        } else {
+            throw new ServiceException(PERSONAL_PASSWORD_PERMISSION_ERROR);
+        }
+        return success(true);
+    }
+
     @PutMapping("/reset-password")
     @Operation(summary = "忘记密码重置")
     @PermitAll