Merge branch 'master' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ

101captain

2022-02-18 82ae0c2d99bb214edb029952e53d1251f5687e54

Merge branch 'master' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComMngPopulationDOMapper.xml

@@ -242,9 +242,8 @@
        com_mng_population AS cmp
        LEFT JOIN com_mng_village AS cmv ON cmv.village_id = cmp.village_id
        LEFT JOIN com_mng_population_community_tags AS cmpct ON cmp.id = cmpct.population_id
        LEFT JOIN event_grid_data as egd on egd.grid_community_id = cmpct.community_id
        WHERE
        egd.id = #{populationListDTO.gridId}
        cmpct.community_id = #{populationListDTO.communityId}
        <if test = 'populationListDTO.keyWord != null and populationListDTO.keyWord != &quot;&quot;' >
            AND (cmp.`name` LIKE concat (#{populationListDTO.keyWord},'%') or cmp.card_no_str like concat (#{populationListDTO.keyWord},'%'))
        </if>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ConvenientMerchantMapper.xml

@@ -213,7 +213,7 @@
        SELECT * FROM (
        SELECT id, `name`, consultation_volume, view_num
        FROM com_convenient_merchants
        WHERE area_code=#{areaCode} and  (community_id = ${pagePopularMerchantDTO.communityId} OR community_id = 0) AND is_del = 0 ORDER BY (consultation_volume + consultation_volume) DESC LIMIT 100
        WHERE area_code=#{pagePopularMerchantDTO.areaCode} and  (community_id = ${pagePopularMerchantDTO.communityId} OR community_id = 0) AND is_del = 0 ORDER BY (consultation_volume + consultation_volume) DESC LIMIT 100
        ) temp
    </select>
    <select id="getIndexMerchantBaseData"