Merge remote-tracking branch 'origin/master'

guyue

22 小时以前 41b70b1de21eca6ad2cade92c56ae400386c628b

 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();