修改

xuhy

2026-01-07 25e72517aeae5066dab2e7ad3b6ec9301342e1f4

修改

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

@@ -140,7 +140,7 @@
        long keyCount = largeKeyGridUserService.count(Wrappers.lambdaQuery(TLargeKeyGridUser.class)
                .eq(TLargeKeyGridUser::getUserType, 1));
        List<TLargeKeyPersonnelType> list = largeKeyPersonnelTypeService.list(Wrappers.lambdaQuery(TLargeKeyPersonnelType.class)
                .ne(TLargeKeyPersonnelType::getShowType, 1));
                .eq(TLargeKeyPersonnelType::getShowType, 1));
        if(!CollectionUtils.isEmpty(list)){
            int sum = list.stream().filter(e->Objects.nonNull(e.getShowNumber())).mapToInt(TLargeKeyPersonnelType::getShowNumber).sum();
            keyCount += sum;

 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;
@@ -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;

 ruoyi-system/src/main/java/com/ruoyi/system/model/TLargeKeyGridUser.java

@@ -74,7 +74,8 @@
    @TableField("id_card")
    private String idCard;

    @Pattern(regexp = "^$|^1[3-9]\\d{9}$",message = "手机号格式不正确")
//    @Pattern(regexp = "^$|^1[3-9]\\d{9}$",message = "手机号格式不正确")
    @Length(max = 11,message = "手机号不能超过11个字符")
    @ApiModelProperty(value = "联系电话")
    @TableField("contact_number")
    private String contactNumber;