From c4abb3711bcee356935339f7c9fd9e2b58dee2bf Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期日, 13 七月 2025 00:05:02 +0800
Subject: [PATCH] 修改bug
---
src/main/java/com/linghu/controller/UserController.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/linghu/controller/UserController.java b/src/main/java/com/linghu/controller/UserController.java
index 619e913..ab47d9b 100644
--- a/src/main/java/com/linghu/controller/UserController.java
+++ b/src/main/java/com/linghu/controller/UserController.java
@@ -82,6 +82,10 @@
if (list != null && list.size() > 0) {
return ResponseResult.success("该邮箱已存在");
}
+ if (!user1.getUser_email().equals(user.getUser_email())||!user1.getPassword().equals(user.getPassword())) {
+ user1.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