Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_temp

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/form/PublishGroupActFormDTO.java

@@ -47,7 +47,6 @@ public class PublishGroupActFormDTO implements Serializable {
     /**
      * 类别编码
      */
-    @NotBlank(message = "categoryCode不能为空", groups = AddUserInternalGroup.class)
     private String categoryCode;
 
     /**

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java

@@ -135,6 +135,10 @@ public class GroupActInfoServiceImpl extends BaseServiceImpl<GroupActInfoDao, Gr
 
         ResiGroupDTO groupDTO = resiGroupService.get(formDTO.getGroupId());
         formDTO.setGridId(groupDTO.getGridId());
+        if(StrConstant.EPMETY_STR.equals(formDTO.getCategoryCode())){
+            formDTO.setCategoryCode(formDTO.getParentCode());
+            formDTO.setParentCode(NumConstant.ZERO_STR);
+        }
         //参数校验
         this.checkPublishGroupActFormDTO(formDTO);
         //内容审核