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-flow/src/pages/system/user/components/edit.jsx | 47 ++++++++++-------------
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/UserController.java | 23 +++++++++--
zy-asrs-framework/src/main/java/com/zy/asrs/framework/generators/BetterGenerator.java | 1
3 files changed, 40 insertions(+), 31 deletions(-)
diff --git a/zy-asrs-flow/src/pages/system/user/components/edit.jsx b/zy-asrs-flow/src/pages/system/user/components/edit.jsx
index a38e153..5522848 100644
--- a/zy-asrs-flow/src/pages/system/user/components/edit.jsx
+++ b/zy-asrs-flow/src/pages/system/user/components/edit.jsx
@@ -88,11 +88,16 @@
placeholder="璇疯緭鍏�"
rules={[{ required: true, message: "鐧诲綍璐﹀彿涓嶈兘涓虹┖锛�" }]}
/>
- <ProFormText
- name="password"
- label="鐧诲綍瀵嗙爜"
+ <ProFormSelect
+ name="sex"
+ label="鎬у埆"
colProps={{ md: 12, xl: 12 }}
- placeholder="璇疯緭鍏�"
+ placeholder="璇烽�夋嫨"
+ options={[
+ { label: '鏈煡', value: 0 },
+ { label: '鐢�', value: 1 },
+ { label: '濂�', value: 2 },
+ ]}
/>
</ProForm.Group>
<ProForm.Group>
@@ -103,15 +108,15 @@
placeholder="璇疯緭鍏�"
rules={[
{
- pattern: /^1[3456789]\d{9}$/,
- message: '璇疯緭鍏ユ纭殑鎵嬫満鍙风爜!',
+ pattern: /^1[3456789]\d{9}$/,
+ message: '璇疯緭鍏ユ纭殑鎵嬫満鍙风爜!',
},
{
- required: false,
- message: '鎵嬫満鍙风爜涓嶈兘涓虹┖!',
+ required: false,
+ message: '鎵嬫満鍙风爜涓嶈兘涓虹┖!',
},
- ]}
-
+ ]}
+
/>
<ProFormText
name="email"
@@ -120,14 +125,14 @@
placeholder="璇疯緭鍏�"
rules={[
{
- type: 'email',
- message: '璇疯緭鍏ユ纭殑閭鍦板潃!',
+ type: 'email',
+ message: '璇疯緭鍏ユ纭殑閭鍦板潃!',
},
{
- required: false,
- message: '閭涓嶈兘涓虹┖!',
+ required: false,
+ message: '閭涓嶈兘涓虹┖!',
},
- ]}
+ ]}
/>
</ProForm.Group>
<ProForm.Group>
@@ -145,17 +150,7 @@
/>
</ProForm.Group>
<ProForm.Group>
- <ProFormSelect
- name="sex"
- label="鎬у埆"
- colProps={{ md: 12, xl: 12 }}
- placeholder="璇烽�夋嫨"
- options={[
- { label: '鏈煡', value: 0 },
- { label: '鐢�', value: 1 },
- { label: '濂�', value: 2 },
- ]}
- />
+
<ProFormSelect
name="status"
label="鐘舵��"
diff --git a/zy-asrs-framework/src/main/java/com/zy/asrs/framework/generators/BetterGenerator.java b/zy-asrs-framework/src/main/java/com/zy/asrs/framework/generators/BetterGenerator.java
index e7e9631..7087589 100644
--- a/zy-asrs-framework/src/main/java/com/zy/asrs/framework/generators/BetterGenerator.java
+++ b/zy-asrs-framework/src/main/java/com/zy/asrs/framework/generators/BetterGenerator.java
@@ -865,7 +865,6 @@
if (column.isPrimaryKey()
|| column.getHumpName().equals("deleted")
|| column.getHumpName().equals("hostId")
- || column.getHumpName().equals("memo")
) {
continue;
}
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