From 41b70b1de21eca6ad2cade92c56ae400386c628b Mon Sep 17 00:00:00 2001
From: guyue <1721849008@qq.com>
Date: 星期一, 14 七月 2025 16:22:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/linghu/controller/UserController.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/linghu/controller/UserController.java b/src/main/java/com/linghu/controller/UserController.java
index 619e913..8b086b9 100644
--- a/src/main/java/com/linghu/controller/UserController.java
+++ b/src/main/java/com/linghu/controller/UserController.java
@@ -57,7 +57,7 @@
public ResponseResult add(@RequestBody User user) {
List<User> list = userService.list(new LambdaQueryWrapper<User>().eq(User::getUser_email, user.getUser_email()));
if (list != null && list.size() > 0) {
- return ResponseResult.success("该邮箱已存在");
+ return ResponseResult.error("该邮箱已存在");
}
user.setStatus("正常");
userService.save(user);
@@ -80,8 +80,12 @@
.ne(User::getUser_id, user.getUser_id())
.eq(User::getUser_email, user.getUser_email()));
if (list != null && list.size() > 0) {
- return ResponseResult.success("该邮箱已存在");
+ return ResponseResult.error("该邮箱已存在");
}
+ if (!user1.getUser_email().equals(user.getUser_email())||!user1.getPassword().equals(user.getPassword())) {
+ user.setStatus("正常");
+ }
+
userService.updateById(user);
return ResponseResult.success();
@@ -212,7 +216,9 @@
List<User> insertUserList = new ArrayList<>();
List<String> errorMessages = new ArrayList<>();
Set<String> emailSet = new HashSet<>(); // 用于校验导入数据中的邮箱重复
-
+ if (excelDataList.isEmpty()) {
+ return ResponseResult.error("导入失败，数据不能为空");
+ }
for (ExcelDataWithRow<UserExcel> excelData : excelDataList) {
int rowNum = excelData.getRowNumber();
UserExcel excelRowData = excelData.getData();
--
Gitblit v1.7.1