恢复修改密码接口 添加修改用户信息禁止修改租户

hx-base/src/main/java/com/fjhx/base/system/SysProfileController.java

@@ -84,7 +84,7 @@ public class SysProfileController extends BaseController {
      * 重置密码
      */
     @Log(title = "个人信息", businessType = BusinessType.UPDATE)
-//    @PutMapping("/updatePwd")
+    @PutMapping("/updatePwd")
     public AjaxResult updatePwd(String oldPassword, String newPassword) {
         LoginUser loginUser = getLoginUser();
         String userName = loginUser.getUsername();

hx-base/src/main/java/com/fjhx/base/system/SysUserController.java

@@ -164,7 +164,7 @@ public class SysUserController extends BaseController {
      */
     // @PreAuthorize("@ss.hasPermi('system:user:resetPwd')")
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
-//    @PutMapping("/resetPwd")
+    @PutMapping("/resetPwd")
     public AjaxResult resetPwd(@RequestBody SysUser user) {
         userService.checkUserAllowed(user);
         userService.checkUserDataScope(user.getUserId());

hx-tenant/src/main/java/com/fjhx/tenant/controller/tenant/UserTenantController.java

@@ -107,7 +107,7 @@ public class UserTenantController extends BaseController {
     /**
      * 重置密码
      */
-//    @PutMapping("/resetPwd")
+    @PutMapping("/resetPwd")
     public void resetPwd(@RequestBody SysUser user) {
         userService.checkUserAllowed(user);
         userService.checkUserDataScope(user.getUserId());

ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -340,7 +340,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="loginDate != null">login_date = #{loginDate},</if>
             <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
             <if test="remark != null">remark = #{remark},</if>
-            <if test="tenantId != null and tenantId != ''">tenant_id = #{tenantId},</if>
+<!--            禁止修改租户-->
+<!--            <if test="tenantId != null and tenantId != ''">tenant_id = #{tenantId},</if>-->
             <if test="userType != null and userType != ''">user_type = #{userType},</if>
             <if test="jobNumber != null and jobNumber != ''">job_number = #{jobNumber},</if>
 			<if test="userCode != null and userCode != ''">user_code = #{userCode},</if>