Merge branch 'yibin' into test

101captain

2022-01-18 b22bc1a0d7931c9e91b96f1cd7c1c1855ff69ebf

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

@@ -28,6 +28,9 @@
            <if test="comActWorkGuideClassifyVO.classifyName != null and comActWorkGuideClassifyVO.classifyName !=''">
                AND classify_name like concat ('%', #{comActWorkGuideClassifyVO.classifyName}, '%')
            </if>
            <if test="comActWorkGuideClassifyVO.areaCode != null and comActWorkGuideClassifyVO.areaCode !=''">
                AND area_code = #{comActWorkGuideClassifyVO.areaCode}
            </if>
        </where>
        order by create_at desc
    </select>
@@ -36,6 +39,11 @@
        SELECT cawgc.id, cawgc.classify_name, cawgc.picture_url,( SELECT count( id ) FROM com_act_work_guide WHERE classify = cawgc.id ) AS `count`
        FROM
            com_act_work_guide_classify AS cawgc
        <where>
            <if test="areaCode!=null">
                and cawgc.area_code = #{area_code}
            </if>
        </where>
        order by `count` asc
    </select>