From 26aab2c2b800575744ad71dcd3a82e7432d12300 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 29 Aug 2022 15:58:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E5=8F=82=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../partymember/dto/partyOrg/form/PartyActStatisFormDTO.java | 5 ----- .../modules/partyOrg/service/impl/IcPartyActServiceImpl.java | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/PartyActStatisFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/PartyActStatisFormDTO.java index f0e8cedeed..b2206cf169 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/PartyActStatisFormDTO.java +++ b/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】 diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index 94d52d1418..6db82bb81a 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/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 partyOrgIdList = orgDTOList.stream().map(IcPartyOrgDTO::getId).collect(Collectors.toList()); //如果党组织是支部类型,则直属下级是党小组 - if ("6".equals(formDTO.getJoinOrgType())) { + if ("5".equals(orgDTOList.get(0).getPartyOrgType())) { Result> result = resiGroupOpenFeignClient.partyGroupList(formDTO.getJoinOrgId()); if (!result.success()) { throw new RenException("获取党支部下党小组列表失败:" + result.getInternalMsg());