From 2d1b39fae6abed7cda7bd5722fcea23fefdb6e12 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期二, 11 二月 2025 10:56:52 +0800
Subject: [PATCH] #
---
rsf-server/src/main/java/com/vincent/rsf/server/system/controller/UserController.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/UserController.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/UserController.java
index 3eb27ed..a1a0724 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/UserController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/UserController.java
@@ -14,6 +14,7 @@
import com.vincent.rsf.server.system.controller.param.ResetPwdParam;
import com.vincent.rsf.server.system.entity.User;
import com.vincent.rsf.server.system.entity.UserRole;
+import com.vincent.rsf.server.system.enums.StatusType;
import com.vincent.rsf.server.system.service.UserRoleService;
import com.vincent.rsf.server.system.service.UserService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -25,7 +26,6 @@
import java.util.*;
@RestController
-@RequestMapping("")
public class UserController extends BaseController {
public static final String COMMON_PASSWORD = "123456";
@@ -82,16 +82,21 @@
&& userService.count(new LambdaQueryWrapper<User>().eq(User::getPhone, user.getPhone())) > 0) {
return R.error("the phone already exist");
}
+ if (!Cools.isEmpty(user.getEmail())
+ && userService.count(new LambdaQueryWrapper<User>().eq(User::getEmail, user.getEmail())) > 0) {
+ return R.error("the email already exist");
+ }
if (Cools.isEmpty(user.getPassword())) {
user.setPassword(userService.encodePassword(COMMON_PASSWORD));
}
+ Date now = new Date();
user.setCreateBy(getLoginUserId());
- user.setCreateTime(new Date());
+ user.setCreateTime(now);
user.setUpdateBy(getLoginUserId());
- user.setUpdateTime(new Date());
-
+ user.setUpdateTime(now);
+ user.setStatus(StatusType.ENABLE.val);
if (!userService.save(user)) {
throw new CoolException("Internal Server Error");
}
@@ -131,6 +136,11 @@
.ne(User::getId, user.getId())) > 0) {
return R.error("the phone already exist");
}
+ if (!Cools.isEmpty(user.getEmail()) && userService.count(new LambdaQueryWrapper<User>()
+ .eq(User::getEmail, user.getEmail())
+ .ne(User::getId, user.getId())) > 0) {
+ return R.error("the email already exist");
+ }
if (!Cools.isEmpty(user.getPassword())) {
user.setPassword(userService.encodePassword(user.getPassword()));
--
Gitblit v1.9.1