diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcUserRoleResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcUserRoleResultDTO.java index 2daa69618e..97cc70ea11 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcUserRoleResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcUserRoleResultDTO.java @@ -1,9 +1,10 @@ package com.epmet.dto.result; -import com.epmet.resi.partymember.dto.partymember.IcPartyMemberDTO; import lombok.Data; import java.io.Serializable; +import java.util.List; +import java.util.Map; /** * @Description @@ -22,5 +23,5 @@ public class IcUserRoleResultDTO implements Serializable { */ private String isPartyMember; - private IcPartyMemberDTO partyMemberInfo; + private Map>> detail; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java index b26bb760e8..7687f5920e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java @@ -2237,6 +2237,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl>> detail = new HashMap<>(); result.setIsVolunteer(NumConstant.ZERO_STR); result.setIsPartyMember(NumConstant.ZERO_STR); //根据身份证获取小程序端居民信息 @@ -2264,9 +2265,20 @@ public class IcResiUserServiceImpl extends BaseServiceImpl memberInfoResult = resiPartyMemberOpenFeignClient.getPartyMemberByIdCard(memberFormDTO); if (memberInfoResult.success() && null != memberInfoResult.getData()) { + List> list = new ArrayList<>(); + Map memberMap = new HashMap<>(); result.setIsPartyMember(NumConstant.ONE_STR); - result.setPartyMemberInfo(memberInfoResult.getData()); - } + com.epmet.resi.partymember.dto.partymember.IcPartyMemberDTO dto = memberInfoResult.getData(); + memberMap.put("RDSJ", dto.getRdsj()); + memberMap.put("SSZB", dto.getSszb()); + memberMap.put("IS_LD", dto.getIsLd()); + memberMap.put("LDZH", dto.getLdzh()); + memberMap.put("PARTY_ZW", dto.getPartyZw()); + memberMap.put("IS_DYZXH", dto.getIsDyzxh()); + list.add(memberMap); + detail.put("ic_party_member", list); + } + result.setDetail(detail); return result; }