From 521345a403e6bf5fce22469083d7d55f8b051d4e Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 24 Aug 2022 15:04:48 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A4=BE=E4=BC=9A=E7=BB=84=E7=BB=87=E5=86=8D?= =?UTF-8?q?=E6=AC=A1=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dto/form/AddSocietyOrgFormDTO.java | 2 +- .../java/com/epmet/dto/form/EditSocietyOrgFormDTO.java | 2 +- .../main/java/com/epmet/excel/IcSocietyOrgExportExcel.java | 4 ++-- .../com/epmet/service/impl/IcSocietyOrgServiceImpl.java | 7 ------- 4 files changed, 4 insertions(+), 11 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/AddSocietyOrgFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/AddSocietyOrgFormDTO.java index 391652762d..a78b42a471 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/AddSocietyOrgFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/AddSocietyOrgFormDTO.java @@ -68,7 +68,7 @@ public class AddSocietyOrgFormDTO implements Serializable { /** * 负责人 */ - @NotBlank(message = "负责人名称不能为空", groups = { AddSocietyOrgFormDTO.Add.class }) + //@NotBlank(message = "负责人名称不能为空", groups = { AddSocietyOrgFormDTO.Add.class }) @Length(max = 20, message = "负责人名称不能超过20个字符",groups = {Add.class}) private String personInCharge; /** diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/EditSocietyOrgFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/EditSocietyOrgFormDTO.java index 4dfe1df9b2..1e65306066 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/EditSocietyOrgFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/EditSocietyOrgFormDTO.java @@ -60,7 +60,7 @@ public class EditSocietyOrgFormDTO implements Serializable { /** * 负责人 */ - @Length(max = 20, message = "负责人名称不能超过20个字符",groups = {Edit.class}) + //@Length(max = 20, message = "负责人名称不能超过20个字符",groups = {Edit.class}) private String personInCharge; /** * 负责人电话 diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcSocietyOrgExportExcel.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcSocietyOrgExportExcel.java index bf914d42d6..5f0c8bdb79 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcSocietyOrgExportExcel.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcSocietyOrgExportExcel.java @@ -35,8 +35,8 @@ public class IcSocietyOrgExportExcel { @ExcelProperty(value = "管理员姓名") private String adminStaffName; - @ColumnWidth(30) + /*@ColumnWidth(30) @ExcelProperty(value = "地址") - private String address; + private String address;*/ } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java index be5ccf565b..ebbc75615b 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java @@ -174,13 +174,6 @@ public class IcSocietyOrgServiceImpl extends BaseServiceImplStringUtils.isNotBlank(f.getAdminStaffId())).forEach(r -> listResult.getData().stream().filter(u -> r.getAdminStaffId().equals(u.getStaffId())).forEach(u -> r.setAdminStaffName(u.getStaffName()))); - /* result.getList().forEach(dto1->{ - listResult.getData().forEach(staff->{ - if(dto1.getAdminStaffId().equals(staff.getStaffId())){ - dto1.setAdminStaffName(staff.getStaffName()); - } - }); - });*/ } //3.查询被绑定管理员信息