Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

yanghui

2022-10-19 51930db8790b328b74be206553d2e0ec50c6ef2d

Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

 flower_city/src/main/resources/mapper/OrganizationChartMapper.xml

@@ -94,7 +94,7 @@
    <select id="selectByCode" resultMap="OrganizationChartResult">
        <include refid="selectOrganizationChartVo"/>
        <where>
            id=#{id}   and  (city=#{areaCode} or district= #{areaCode} or village=#{areaCode})
           ( id=#{id} or parent_id=#{id})   and  (city=#{areaCode} or district= #{areaCode} or village=#{areaCode})
        </where>
    </select>


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

@@ -423,6 +423,7 @@
    <select id="dateAnalysisY" resultType="java.lang.Integer">
        SELECT COUNT(id) FROM com_sanshuo_event_info
        WHERE create_at BETWEEN DATE_FORMAT(#{beginDate}, '%Y-%m-%d 00:00:00') AND DATE_FORMAT(#{endDate}, '%Y-%m-%d 23:59:59')
        AND event_process_status not in (9)
        <if test="dto.type == 2">
            AND current_process_type=1
            <if test="dto.id != null">