Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-10-19 27704b0f33dfa3b22f11d36124a8d08b720461f8

Merge branch 'zigonggao_dev' 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>