Merge remote-tracking branch 'origin/dev_party_helper' into dev_party_helper

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

@@ -15,11 +15,6 @@ public class PartyActStatisFormDTO implements Serializable {
      */
     @NotBlank(message = "党组织Id不能为空", groups = AddGroup.class)
     private String joinOrgId;
-    /**
-     * 党组织类型  0省委,1市委,2区委,3党工委,4党委,5支部；6党小组
-     */
-    @NotBlank(message = "党组织类型不能为空", groups = AddGroup.class)
-    private String joinOrgType;
 
     /**
      * 活动开始时间 【yyyy-MM-dd】

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

@@ -768,7 +768,7 @@ public class IcPartyActServiceImpl extends BaseServiceImpl<IcPartyActDao, IcPart
         }
         List<String> partyOrgIdList = orgDTOList.stream().map(IcPartyOrgDTO::getId).collect(Collectors.toList());
         //如果党组织是支部类型，则直属下级是党小组
-        if ("6".equals(formDTO.getJoinOrgType())) {
+        if ("5".equals(orgDTOList.get(0).getPartyOrgType())) {
             Result<List<ResiGroupDTO>> result = resiGroupOpenFeignClient.partyGroupList(formDTO.getJoinOrgId());
             if (!result.success()) {
                 throw new RenException("获取党支部下党小组列表失败：" + result.getInternalMsg());