bug处理

xuhy

2026-03-02 9da3041d5a71f30a0f0f9dc005ffc4af88ef7bec

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TLargeKeyGridUserController.java

@@ -279,7 +279,7 @@
                i++;
                continue;
            }
            if (!largeKeyGridUserImport.getContactNumber().matches("^$|^1[3-9]\\d{9}$")){
            if (largeKeyGridUserImport.getContactNumber().length() != 11){
                result.append("第"+i+"行：[", "联系电话"+"]格式不正确");
                i++;
                continue;
@@ -356,36 +356,36 @@
        JSONObject result = new JSONObject();
        int i = 1;
        for (LargeKeyGridUserImport largeKeyGridUserImport : largeKeyGridUserImports) {
            if (!StringUtils.hasLength(largeKeyGridUserImport.getGridInfo())){
                result.append("第"+i+"行：[", "网格"+"]不能为空");
                i++;
                continue;
            }
            if (!StringUtils.hasLength(largeKeyGridUserImport.getCommunityName())){
                result.append("第"+i+"行：[", "小区名称"+"]不能为空");
                i++;
                continue;
            }
            if (!StringUtils.hasLength(largeKeyGridUserImport.getRegisteredResidence())){
                result.append("第"+i+"行：[", "户籍地"+"]不能为空");
                i++;
                continue;
            }
            if (!StringUtils.hasLength(largeKeyGridUserImport.getBuildingInfo())){
                result.append("第"+i+"行：[", "楼栋信息"+"]不能为空");
                i++;
                continue;
            }
            if (!StringUtils.hasLength(largeKeyGridUserImport.getUnitNumber())){
                result.append("第"+i+"行：[", "单元号"+"]不能为空");
                i++;
                continue;
            }
            if (!StringUtils.hasLength(largeKeyGridUserImport.getHouseNumber())){
                result.append("第"+i+"行：[", "门牌号"+"]不能为空");
                i++;
                continue;
            }
//            if (!StringUtils.hasLength(largeKeyGridUserImport.getGridInfo())){
//                result.append("第"+i+"行：[", "网格"+"]不能为空");
//                i++;
//                continue;
//            }
//            if (!StringUtils.hasLength(largeKeyGridUserImport.getCommunityName())){
//                result.append("第"+i+"行：[", "小区名称"+"]不能为空");
//                i++;
//                continue;
//            }
//            if (!StringUtils.hasLength(largeKeyGridUserImport.getRegisteredResidence())){
//                result.append("第"+i+"行：[", "户籍地"+"]不能为空");
//                i++;
//                continue;
//            }
//            if (!StringUtils.hasLength(largeKeyGridUserImport.getBuildingInfo())){
//                result.append("第"+i+"行：[", "楼栋信息"+"]不能为空");
//                i++;
//                continue;
//            }
//            if (!StringUtils.hasLength(largeKeyGridUserImport.getUnitNumber())){
//                result.append("第"+i+"行：[", "单元号"+"]不能为空");
//                i++;
//                continue;
//            }
//            if (!StringUtils.hasLength(largeKeyGridUserImport.getHouseNumber())){
//                result.append("第"+i+"行：[", "门牌号"+"]不能为空");
//                i++;
//                continue;
//            }
            if (!StringUtils.hasLength(largeKeyGridUserImport.getUserName())){
                result.append("第"+i+"行：[", "姓名"+"]不能为空");
                i++;
@@ -411,7 +411,7 @@
                i++;
                continue;
            }
            if (!largeKeyGridUserImport.getContactNumber().matches("^$|^1[3-9]\\d{9}$")){
            if (largeKeyGridUserImport.getContactNumber().length() != 11){
                result.append("第"+i+"行：[", "联系电话"+"]格式不正确");
                i++;
                continue;
@@ -436,21 +436,23 @@
                TLargeKeyPersonnelType largeKeyPersonnelType = largeKeyPersonnelTypeService.getOne(Wrappers.lambdaQuery(TLargeKeyPersonnelType.class)
                        .eq(TLargeKeyPersonnelType::getTypeName, largeKeyGridUserImport.getTypeName())
                        .last("LIMIT 1"));
                if(Objects.isNull(largeKeyPersonnelType)){
                    result.append("第"+i+"行：[", "类型名称"+"]不存在");
                    i++;
                    continue;
//                if(Objects.isNull(largeKeyPersonnelType)){
//                    result.append("第"+i+"行：[", "类型名称"+"]不存在");
//                    i++;
//                    continue;
//                }
                if(Objects.nonNull(largeKeyPersonnelType)){
                    largeKeyGridUser.setTypeId(largeKeyPersonnelType.getId());
                }
                largeKeyGridUser.setTypeId(largeKeyPersonnelType.getId());
            }
            largeKeyGridUser.setUserType(2);
            largeKeyGridUsers.add(largeKeyGridUser);
            i++;
        }
        largeKeyGridUserService.saveBatch(largeKeyGridUsers);
        if(!result.isEmpty()){
            return R.fail(result.toString());
        }
        largeKeyGridUserService.saveBatch(largeKeyGridUsers);
        return R.ok();
    }