社会组织再次调整

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;
     /**

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;
     /**
      * 负责人电话

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;*/
 }
 

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java

@@ -174,13 +174,6 @@ public class IcSocietyOrgServiceImpl extends BaseServiceImpl<IcSocietyOrgDao, Ic
                 throw new RenException("获取工作人员基本信息失败......");
             }
             result.getList().stream().filter(f->StringUtils.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.查询被绑定管理员信息