From 5dc69dccd1a31b1f27911e27acdbd21c8544cdb6 Mon Sep 17 00:00:00 2001
From: Bill <771989711@qq.com>
Date: Thu, 9 Nov 2023 17:52:18 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E5=A4=8Dbug=E3=80=91?=
 =?UTF-8?q?=E5=85=9A=E5=91=98=E5=AD=A6=E5=8E=86=E4=BF=A1=E6=81=AF=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E6=80=BB=E6=95=B0=E5=92=8C=E6=80=BB=E4=BA=BA=E6=95=B0?=
 =?UTF-8?q?=E4=B8=8D=E4=B8=80=E8=87=B4=201.=E6=95=B0=E6=8D=AE=E5=BA=93?=
 =?UTF-8?q?=E4=B8=AD=E5=AD=A6=E5=8E=86=E5=AD=97=E6=AE=B5=E7=A9=BA=E5=AD=97?=
 =?UTF-8?q?=E7=AC=A6=E4=B8=B2=E5=92=8Cnull=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/partymember/IcPartyMemberDao.xml   | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

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 395a26d8..8c942d5f 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
@@ -141,23 +141,23 @@
     <select id="getPartyMemberEducationStatistics"
             resultType="com.epmet.commons.tools.dto.result.OptionDataResultDTO">
         SELECT
-            CULTURE AS "code",
-            count(ID) AS "value"
+        CULTURE AS "code",
+        count(ID) AS "value"
         FROM
+            ( SELECT ID, IF(CULTURE = '', NULL, CULTURE) as CULTURE FROM
             ic_party_member
-        WHERE
+            WHERE
             DEL_FLAG = '0'
---         AND CULTURE IS NOT NULL
---         AND CULTURE != ''
-        <choose>
-            <when test='orgId != "" and orgId != null'>
-                AND (SSZB = #{orgId} OR ORG_PIDS LIKE CONCAT('%',#{orgId},'%'))
-            </when>
-            <otherwise>
-                AND (AGENCY_ID = #{agencyId} OR AGENCY_PIDS LIKE CONCAT('%',#{agencyId},'%'))
-            </otherwise>
-        </choose>
-        GROUP BY CULTURE
+            <choose>
+                <when test='orgId != "" and orgId != null'>
+                    AND (SSZB = #{orgId} OR ORG_PIDS LIKE CONCAT('%',#{orgId},'%'))
+                </when>
+                <otherwise>
+                    AND (AGENCY_ID = #{agencyId} OR AGENCY_PIDS LIKE CONCAT('%',#{agencyId},'%'))
+                </otherwise>
+            </choose>
+            ) ipm
+        GROUP BY ipm.CULTURE
     </select>
     <select id="getPartyMemberAgeList" resultType="com.epmet.dto.result.PartyMemberAgeResultDTO">
         SELECT