guyue
17 小时以前 c2a9635771370e7ec908db7e11a5cdd1b5f7bbf0
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);