From 77b53735ca11fe8482d94e29286b255abc47f04f Mon Sep 17 00:00:00 2001
From: chenzhihang <709011834@qq.com>
Date: Mon, 7 Apr 2025 10:35:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=94=A8=E6=88=B7=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=EF=BC=8C=E6=9B=B4=E6=96=B0=E7=94=A8=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/system/api/domain/SysUser.java  | 20 +++++++++++++++----
 .../system/controller/SysUserController.java  |  5 -----
 .../service/impl/SysUserServiceImpl.java      |  2 +-
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java
index 1cd20475..e93883ea 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java
@@ -5,11 +5,9 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ContentStyle;
 import com.alibaba.excel.enums.poi.HorizontalAlignmentEnum;
 import com.alibaba.excel.enums.poi.VerticalAlignmentEnum;
-import com.ruoyi.common.core.annotation.Excel;
-import com.ruoyi.common.core.annotation.Excel.Type;
-import com.ruoyi.common.core.annotation.Excels;
 import com.ruoyi.common.core.web.domain.BaseEntity;
 import com.ruoyi.common.core.xss.Xss;
+import com.ruoyi.system.api.constant.Constant;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -69,9 +67,11 @@ public class SysUser extends BaseEntity {
     /**
      * 用户性别
      */
-    @ExcelProperty(value = "用户性别", order = 6)
     private String sex;
 
+    @ExcelProperty(value = "用户性别", order = 6)
+    private String sexName;
+
     /**
      * 用户头像
      */
@@ -220,6 +220,18 @@ public class SysUser extends BaseEntity {
         this.sex = sex;
     }
 
+    public String getSexName() {
+        if (Constant.Sex_Men.equals(this.sex)) {
+            return "男";
+        } else {
+            return "女";
+        }
+    }
+
+    public void setSexName(String sexName) {
+        this.sexName = sexName;
+    }
+
     public String getAvatar() {
         return avatar;
     }
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
index 3fb609e7..eec43c76 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
@@ -295,9 +295,4 @@ public class SysUserController extends BaseController {
     public AjaxResult deptTree(SysDept dept) {
         return success(deptService.selectDeptTreeList(dept));
     }
-
-    @GetMapping("/getOriginPwd")
-    public R<String> getOriginPwd(@RequestParam(value = "username") String username) {
-        return R.ok(userService.getOriginPwd(username));
-    }
 }
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
index ca5ae679..fec92092 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -408,7 +408,7 @@ public class SysUserServiceImpl implements ISysUserService {
         remoteAuthService.edit(user);
 
         // todo 更新火石平台用户
-
+        SecurityUtils.getLoginUser().getSysUser().setOriginPassword(user.getOriginPassword());
         return userMapper.updateUser(user);
     }