【修复bug】党员学历信息统计总数和总人数不一致

1.数据库中学历字段空字符串和null合并

code/smart-community/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcPartyMemberDao.xml

@@ -144,11 +144,10 @@
         CULTURE AS "code",
         count(ID) AS "value"
         FROM
+            ( SELECT ID, IF(CULTURE = '', NULL, CULTURE) as CULTURE FROM
             ic_party_member
             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},'%'))
@@ -157,7 +156,8 @@
                     AND (AGENCY_ID = #{agencyId} OR AGENCY_PIDS LIKE CONCAT('%',#{agencyId},'%'))
                 </otherwise>
             </choose>
-        GROUP BY CULTURE
+            ) ipm
+        GROUP BY ipm.CULTURE
     </select>
     <select id="getPartyMemberAgeList" resultType="com.epmet.dto.result.PartyMemberAgeResultDTO">
         SELECT