From 2e830efbe694a3d328251b41690dc685a6e080ea Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期一, 27 五月 2024 09:51:30 +0800
Subject: [PATCH] feat：修改用户时返回密码
---
src/main/java/com/mindskip/xzs/controller/admin/UserController.java | 1 +
src/main/java/com/mindskip/xzs/viewmodel/admin/user/UserResponseVM.java | 11 +++++++++++
2 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/mindskip/xzs/controller/admin/UserController.java b/src/main/java/com/mindskip/xzs/controller/admin/UserController.java
index d921a84..49a14b9 100644
--- a/src/main/java/com/mindskip/xzs/controller/admin/UserController.java
+++ b/src/main/java/com/mindskip/xzs/controller/admin/UserController.java
@@ -96,6 +96,7 @@
}
userVm.setDeptIds(deptIds.equals("") ? "" : deptIds.substring(0,deptIds.length()-1));
userVm.setTagIds(tagService.selectTagIdsByUserId(user.getId()));
+ userVm.setPassword(authenticationService.pwdDecode(user.getPassword()));
return RestResponse.ok(userVm);
}
diff --git a/src/main/java/com/mindskip/xzs/viewmodel/admin/user/UserResponseVM.java b/src/main/java/com/mindskip/xzs/viewmodel/admin/user/UserResponseVM.java
index ce8318e..ca26641 100644
--- a/src/main/java/com/mindskip/xzs/viewmodel/admin/user/UserResponseVM.java
+++ b/src/main/java/com/mindskip/xzs/viewmodel/admin/user/UserResponseVM.java
@@ -54,6 +54,16 @@
private List<Integer> deptIdList;
+ private String password;
+
+ public String getPassword() {
+ return password;
+ }
+
+ public void setPassword(String password) {
+ this.password = password;
+ }
+
public List<Integer> getDeptIdList() {
return deptIdList;
}
@@ -76,6 +86,7 @@
vm.setLastActiveTime(DateTimeUtil.dateFormat(user.getLastActiveTime()));
vm.setCreateTime(DateTimeUtil.dateFormat(user.getCreateTime()));
vm.setModifyTime(DateTimeUtil.dateFormat(user.getModifyTime()));
+ vm.setPassword(null);
return vm;
}
--
Gitblit v1.8.0