From d08df798229ebb214e8ea7efa450467774432a22 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Thu, 9 Jun 2022 14:07:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E8=BA=AB=E4=BB=BD=E8=AF=81?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=85=9A=E5=91=98=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/dto/result/IcUserRoleResultDTO.java    |  5 +++--
 .../service/impl/IcResiUserServiceImpl.java      | 16 ++++++++++++++--
 2 files changed, 17 insertions(+), 4 deletions(-)

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<String, List<Map<String, Object>>> 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<IcResiUserDao, IcResi
     @Override
     public IcUserRoleResultDTO getUserRoleByIdCard(IcResiUserDTO formDTO) {
         IcUserRoleResultDTO result = new IcUserRoleResultDTO();
+        Map<String, List<Map<String, Object>>> detail = new HashMap<>();
         result.setIsVolunteer(NumConstant.ZERO_STR);
         result.setIsPartyMember(NumConstant.ZERO_STR);
         //根据身份证获取小程序端居民信息
@@ -2264,9 +2265,20 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         memberFormDTO.setIdCard(formDTO.getIdCard());
         Result<com.epmet.resi.partymember.dto.partymember.IcPartyMemberDTO> memberInfoResult = resiPartyMemberOpenFeignClient.getPartyMemberByIdCard(memberFormDTO);
         if (memberInfoResult.success() && null != memberInfoResult.getData()) {
+            List<Map<String, Object>> list = new ArrayList<>();
+            Map<String, Object> 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;
     }