From fcb374a34f600ab48856f632ae937a2396a2b2d5 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 9 May 2023 13:45:57 +0800 Subject: [PATCH 1/2] 111 --- .../com/epmet/excel/yt/IcPropertyManagementImportExcelData.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/yt/IcPropertyManagementImportExcelData.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/yt/IcPropertyManagementImportExcelData.java index cf9ad9d66b..7a318bbad7 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/yt/IcPropertyManagementImportExcelData.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/yt/IcPropertyManagementImportExcelData.java @@ -37,7 +37,7 @@ public class IcPropertyManagementImportExcelData { /** * 物业名称 */ - @ExcelProperty(value = "物业名称") + @ExcelProperty(value = "*物业名称") private String name; /** From 9b920e5256789e85b4b952bce9d963f6449190e8 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 9 May 2023 13:47:40 +0800 Subject: [PATCH 2/2] 111 --- .../com/epmet/controller/PropertyManagementController.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PropertyManagementController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PropertyManagementController.java index 50767693ed..c6bfacb04e 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PropertyManagementController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PropertyManagementController.java @@ -153,6 +153,9 @@ public class PropertyManagementController implements ResultDataResolver { public Result> deleteBatch(@RequestBody List ids) { if (CollectionUtils.isNotEmpty(ids)) { List failedIdList = propertyManagementService.deleteBatch(ids); + if(CollectionUtils.isEmpty(failedIdList)){ + return new Result<>(); + } Result result = new Result>().ok(failedIdList); result.setMsg("部门物业删除失败"); result.setCode(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode());