From c2a9635771370e7ec908db7e11a5cdd1b5f7bbf0 Mon Sep 17 00:00:00 2001
From: guyue <1721849008@qq.com>
Date: 星期一, 14 七月 2025 17:23:29 +0800
Subject: [PATCH] 修改删除提问词，用户添加和导入设置创建时间
---
src/main/java/com/linghu/controller/UserController.java | 14 +++++++++++---
1 files changed, 11 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..7958d99 100644
--- a/src/main/java/com/linghu/controller/UserController.java
+++ b/src/main/java/com/linghu/controller/UserController.java
@@ -57,9 +57,10 @@
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("正常");
+ user.setCreate_time(LocalDateTime.now());
userService.save(user);
return ResponseResult.success();
@@ -80,8 +81,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 +217,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();
@@ -257,6 +264,7 @@
user.setUser_email(excelRowData.getUser_email());
user.setPassword(excelRowData.getPassword()); // 实际场景建议加密存储
user.setSectionalization_id(sectionMap.get(excelRowData.getSectionalization_name()).getSectionalization_id());
+ user.setCreate_time(LocalDateTime.now());
user.setStatus("正常");
insertUserList.add(user);
--
Gitblit v1.7.1