From 0923c2a6f1a7b4d28e39f566f9ff27557e2bf250 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 27 三月 2026 14:57:29 +0800
Subject: [PATCH] 修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TLargeKeyGridUserController.java | 84 ++++++++++++++++++++++-------------------
1 files changed, 45 insertions(+), 39 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TLargeKeyGridUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TLargeKeyGridUserController.java
index c630cbe..4e65e2b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TLargeKeyGridUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TLargeKeyGridUserController.java
@@ -109,7 +109,11 @@
@ApiOperation(value = "修改重点人员-网格人员")
@PostMapping(value = "/update")
public R<Boolean> update(@Validated @RequestBody TLargeKeyGridUser dto) {
- return R.ok(largeKeyGridUserService.updateById(dto));
+ largeKeyGridUserService.updateById(dto);
+ if(!StringUtils.hasLength(dto.getTypeId())){
+ largeKeyGridUserService.update(Wrappers.lambdaUpdate(TLargeKeyGridUser.class).set(TLargeKeyGridUser::getTypeId, null).eq(TLargeKeyGridUser::getId, dto.getId()));
+ }
+ return R.ok();
}
/**
@@ -279,7 +283,7 @@
i++;
continue;
}
- if (!largeKeyGridUserImport.getContactNumber().matches("^$|^1[3-9]\\d{9}$")){
+ if (largeKeyGridUserImport.getContactNumber().length() != 11){
result.append("第"+i+"行：[", "联系电话"+"]格式不正确");
i++;
continue;
@@ -356,36 +360,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 +415,7 @@
i++;
continue;
}
- if (!largeKeyGridUserImport.getContactNumber().matches("^$|^1[3-9]\\d{9}$")){
+ if (largeKeyGridUserImport.getContactNumber().length() != 11){
result.append("第"+i+"行：[", "联系电话"+"]格式不正确");
i++;
continue;
@@ -436,21 +440,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();
}
--
Gitblit v1.7.1