From 755f0ee55c0338ddddbcf138ee0d47cd0e801a8e Mon Sep 17 00:00:00 2001
From: Bill <771989711@qq.com>
Date: Thu, 9 Nov 2023 13:23:49 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E3=80=91=E5=85=9A=E5=91=98=E5=AD=A6=E5=8E=86=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=85=B6=E4=BB=96=E5=88=86=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/IcPartyMemberServiceImpl.java     | 14 +++++++++++++-
 .../mapper/partymember/IcPartyMemberDao.xml        |  4 ++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/code/smart-community/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java b/code/smart-community/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java
index d80fa318..e0018dfa 100644
--- a/code/smart-community/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java
+++ b/code/smart-community/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java
@@ -30,6 +30,7 @@ import com.epmet.dto.form.IcPartyMemberListFormDTO;
 import com.epmet.dto.result.PartyMemberAgeResultDTO;
 import com.epmet.dto.result.PartyMemberEducationResultDTO;
 import com.epmet.dto.result.UploadImgResultDTO;
+import com.epmet.dto.result.resi.ResiPortrayalResultDTO;
 import com.epmet.feign.*;
 import com.epmet.modules.partyOrg.dao.IcPartyOrgDao;
 import com.epmet.modules.partyOrg.entity.IcPartyOrgEntity;
@@ -407,9 +408,18 @@ public class IcPartyMemberServiceImpl extends BaseServiceImpl<IcPartyMemberDao,
             map = list.stream().collect(Collectors.toMap(OptionDataResultDTO::getCode, OptionDataResultDTO::getValue));
             total = list.stream().mapToInt(item -> Integer.parseInt(item.getValue())).sum();
         }
+
+        /**
+         * 构造”其他“编码
+         */
+        DictListResultDTO otherDic = new DictListResultDTO();
+        otherDic.setLabel("其他");
+        otherDic.setValue(null);
+        dictResult.getData().add(otherDic);
+
         Map<String, String> finalMap = map;
         int finalTotal = total;
-        return dictResult.getData().stream().map(item -> {
+        List<OptionDataResultDTO> optionDataResultDTOS = dictResult.getData().stream().map(item -> {
             OptionDataResultDTO dto = new OptionDataResultDTO();
             dto.setCode(item.getValue());
             dto.setLabel(item.getLabel());
@@ -424,6 +434,8 @@ public class IcPartyMemberServiceImpl extends BaseServiceImpl<IcPartyMemberDao,
             dto.setRadio(radio.stripTrailingZeros().toPlainString().concat("%"));
             return dto;
         }).collect(Collectors.toList());
+
+        return optionDataResultDTOS;
     }
 
     @Override
diff --git a/code/smart-community/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcPartyMemberDao.xml b/code/smart-community/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcPartyMemberDao.xml
index fe1e7e2b..395a26d8 100644
--- a/code/smart-community/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcPartyMemberDao.xml
+++ b/code/smart-community/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcPartyMemberDao.xml
@@ -147,8 +147,8 @@
             ic_party_member
         WHERE
             DEL_FLAG = '0'
-        AND CULTURE IS NOT NULL
-        AND CULTURE != ''
+--         AND CULTURE IS NOT NULL
+--         AND CULTURE != ''
         <choose>
             <when test='orgId != "" and orgId != null'>
                 AND (SSZB = #{orgId} OR ORG_PIDS LIKE CONCAT('%',#{orgId},'%'))