Merge branch 'develop' into release_temp

epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/PartyMemberStyleFormDTO.java

@@ -3,6 +3,7 @@ package com.epmet.resi.partymember.dto.partymember.form;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 
 /**
@@ -14,6 +15,7 @@ import java.io.Serializable;
 @Data
 public class PartyMemberStyleFormDTO implements Serializable {
     private static final long serialVersionUID = 4743261460276449408L;
+    @NotBlank(message = "组织ID不能为空")
     private String agencyId;
     private String gridId;
     private String name;

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartymemberStyleController.java

@@ -108,6 +108,7 @@ public class IcPartymemberStyleController {
 
     @PostMapping("list")
     public Result<PageData<IcPartymemberStyleDTO>> search(@RequestBody PartyMemberStyleFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO);
         return new Result<PageData<IcPartymemberStyleDTO>>().ok(icPartymemberStyleService.search(formDTO));
     }
 

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartymemberStyleServiceImpl.java

@@ -98,8 +98,10 @@ public class IcPartymemberStyleServiceImpl extends BaseServiceImpl<IcPartymember
         List<IcPartymemberStyleDTO> dtoList = ConvertUtils.sourceToTarget(list, IcPartymemberStyleDTO.class);
         //设置网格名
         dtoList.forEach(item -> {
-            GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(item.getGridId());
+            if (StringUtils.isNotBlank(item.getGridId())) {
-            item.setGridName(gridInfo.getGridName());
+                GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(item.getGridId());
+                item.setGridName(gridInfo.getGridName());
+            }
         });
 
         return dtoList;
@@ -187,8 +189,10 @@ public class IcPartymemberStyleServiceImpl extends BaseServiceImpl<IcPartymember
         PageInfo<IcPartymemberStyleDTO> pageInfo = new PageInfo<>(dtoList);
         //设置网格名
         dtoList.forEach(item -> {
-            GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(item.getGridId());
+            if (StringUtils.isNotBlank(item.getGridId())) {
-            item.setGridName(gridInfo.getGridName());
+                GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(item.getGridId());
+                item.setGridName(gridInfo.getGridName());
+            }
         });
         return new PageData<>(dtoList, pageInfo.getTotal());
     }