From ed7d741fdd1246d17f630f54922728182b2db9fb Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 21 二月 2024 14:15:39 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/UserController.java | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/UserController.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/UserController.java
index 2b137e7..d16855d 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/UserController.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/UserController.java
@@ -16,14 +16,13 @@
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
@RestController
@RequestMapping("/api")
public class UserController extends BaseController {
+
+ public static final String COMMON_PASSWORD = "123456";
@Autowired
private UserService userService;
@@ -52,6 +51,14 @@
@OperationLog("娣诲姞鐢ㄦ埛")
@PostMapping("/user/save")
public R save(@RequestBody User user) {
+
+ user.setPassword(userService.encodePassword(COMMON_PASSWORD));
+
+ user.setCreateBy(getLoginUserId());
+ user.setCreateTime(new Date());
+ user.setUpdateBy(getLoginUserId());
+ user.setUpdateTime(new Date());
+
if (!userService.save(user)) {
return R.error("娣诲姞澶辫触");
}
@@ -62,6 +69,14 @@
@OperationLog("淇敼鐢ㄦ埛")
@PostMapping("/user/update")
public R update(@RequestBody User user) {
+
+ if (!Cools.isEmpty(user.getPassword())) {
+ user.setPassword(userService.encodePassword(user.getPassword()));
+ }
+
+ user.setUpdateBy(getLoginUserId());
+ user.setUpdateTime(new Date());
+
if (!userService.updateById(user)) {
return R.error("淇敼澶辫触");
}
--
Gitblit v1.9.1