diff --git a/emis-biz/src/main/resources/mapper/EmisSiteMapper.xml b/emis-biz/src/main/resources/mapper/EmisSiteMapper.xml
index 787078e6f..3a0a51325 100644
--- a/emis-biz/src/main/resources/mapper/EmisSiteMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSiteMapper.xml
@@ -172,7 +172,6 @@
             <if test="siteCode != null  and siteCode != ''"> and site_code = #{siteCode}</if>
             <if test="siteName != null  and siteName != ''"> and site_name like concat('%', #{siteName}, '%')</if>
             <if test="siteNameEn != null  and siteNameEn != ''"> and site_name_en like concat('%', #{siteNameEn}, '%')</if>
-            <if test="parentSiteCode != null  and parentSiteCode != ''"> and parent_site_code = #{parentSiteCode}</if>
             <if test="defaultCurrency != null  and defaultCurrency != ''"> and default_currency like concat('%', #{defaultCurrency}, '%')</if>
             <if test="cutOffTime != null  and cutOffTime != ''"> and cut_off_time like concat('%', #{cutOffTime}, '%')</if>
             <if test="superiorFinanceCenterCode != null  and superiorFinanceCenterCode != ''"> and superior_finance_center_code = #{superiorFinanceCenterCode}</if>
@@ -294,10 +293,31 @@
             <if test="updateTime != null "> and update_time = #{updateTime}</if>
             <if test="createSite != null  and createSite != ''"> and create_site like concat('%', #{createSite}, '%')</if>
             <if test="updateSite != null  and updateSite != ''"> and update_site like concat('%', #{updateSite}, '%')</if>
+
+
+
+            <if test="parentSiteCode != null and parentSiteCode != ''">
+                <choose>
+                    <!-- 子网点 -->
+                    <when test="params.blIncludeChildSite != null and params.blIncludeChildSite == '1'">
+                        AND u.site_code in (
+                            SELECT t1.site_code FROM (
+                            SELECT * FROM emis_site WHERE parent_site_code IS NOT NULL ) t1,( SELECT @pid :=
+                            #{parentSiteCode} ) pd
+                            WHERE FIND_IN_SET( parent_site_code, @pid ) > 0 AND @pid := concat(@pid,',',site_code)
+                        )
+                    </when>
+                    <otherwise>
+                        AND u.parent_site_code=#{parentSiteCode}
+                    </otherwise>
+                </choose>
+            </if>
         </where>
         order by order_num desc
     </select>
 
+    <!--            <if test="parentSiteCode != null  and parentSiteCode != ''"> and parent_site_code = #{parentSiteCode}</if>-->
+
     <select id="selectEmisSiteById" parameterType="Long" resultMap="EmisSiteResult">
         select id, site_code, site_name, site_name_en, parent_site_code, default_currency, cut_off_time, superior_finance_center_code, site_type, scope_type, default_destination_name_code, default_send_place, country_code, province, city, county, town, area_code, area_name, range_name, phone, principal, manager, manager_phone, sale_phone, exigence_phone, fax, site_levels, site_desc, dispatch_range, not_dispatch_range, public_remark, private_remark, order_num, financial_account, tb_ser_name, tb_ser_tel, tb_ser_ww, car_start_time, car_end_time, bl_web, join_time, maps_coordinate, specservice_range, qq, email, service_quality, sales_quality, levels, warehouse_name, site_limite, jy_mobile, jy_pwd, bl_not_input, stop_date, bl_allow_agent_money, bl_allow_topayment, goods_payment_limited, topayment_limited, bl_rec, bl_disp, bl_come, bl_open_taobao, bl_arbitration_department, bl_allow_agent_sign, bl_message, bl_provide, bl_projectclient, bl_vip_site, bl_dispatch_zt, bl_billto_account, account_code, address, disp_delivery_mode, trans_type_id, trans_type_name, org_id, org_name, data_from, site_area, bl_allow_disp_agent_money, disp_goods_payment_limited, disp_delivery_site, disp_delivery_site_code, vendor_name, credit_code, bl_cargo_service, bl_handling_service, pickup_center_site_code, bl_disp_good, bl_push_jd, push_date, reason, site_pos, distribute_code, bl_push_site, logo_type, size_code2, size_code3, audit_status, audit_date, audit_man_code, audit_site_code, bl_class, bl_material, soon_piece_type, province_area, second_area, second_area_code, province_area_code, bl_disp_good_name, bl_not_rec, bl_not_disp, bl_not_cash_out, status, increment_service, bl_warehouse_in, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
         from emis_site a