From f650c2c7433b08e76d7c569f9be06173c6759543 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= <2270033969@qq.com>
Date: Sat, 29 Jun 2024 10:22:50 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=94=92=20=E5=AF=B9=E5=A4=96=E8=BE=93?=
 =?UTF-8?q?=E5=87=BA=E4=B8=A5=E7=A6=81=E8=BE=93=E5=87=BA=E6=95=8F=E6=84=9F?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=20password?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 302553bbeb28016e5a11976461d73f8a6a3bd370)
---
 .../main/java/com/pig4cloud/pigx/admin/api/vo/UserVO.java  | 5 +++--
 .../pig4cloud/pigx/admin/controller/SysUserController.java | 7 ++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/UserVO.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/UserVO.java
index 6459556cc..694b28aac 100644
--- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/UserVO.java
+++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/UserVO.java
@@ -19,6 +19,7 @@
 
 package com.pig4cloud.pigx.admin.api.vo;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.pig4cloud.pigx.admin.api.entity.SysPost;
 import com.pig4cloud.pigx.admin.api.entity.SysRole;
 import com.pig4cloud.pigx.common.sensitive.annotation.Sensitive;
@@ -55,13 +56,13 @@ public class UserVO implements Serializable {
 	/**
 	 * 密码
 	 */
-	@Schema(description = "密码")
+	@JsonIgnore
 	private String password;
 
 	/**
 	 * 随机盐
 	 */
-	@Schema(description = "随机盐")
+	@JsonIgnore
 	private String salt;
 
 	/**
diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysUserController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysUserController.java
index d4fb84a64..ec9558717 100644
--- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysUserController.java
+++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysUserController.java
@@ -23,6 +23,7 @@ import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.pig4cloud.pigx.admin.api.dto.UserDTO;
+import com.pig4cloud.pigx.admin.api.dto.UserInfo;
 import com.pig4cloud.pigx.admin.api.entity.SysUser;
 import com.pig4cloud.pigx.admin.api.vo.UserExcelVO;
 import com.pig4cloud.pigx.admin.service.SysUserService;
@@ -86,7 +87,11 @@ public class SysUserController {
 		if (user == null) {
 			return R.failed(MsgUtils.getMessage(ErrorCodes.SYS_USER_QUERY_ERROR));
 		}
-		return R.ok(userService.findUserInfo(user));
+
+		// UserInfo 是复用对象，不能通过设置 @jsonIgnore 来忽略密码字段
+		UserInfo userInfo = userService.findUserInfo(user);
+		userInfo.getSysUser().setPassword(null);
+		return R.ok(userInfo);
 	}
 
 	/**