From ef88aaa9721dd7579297529c3cd85d70984548de Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Tue, 4 Jun 2024 18:09:34 +0800
Subject: [PATCH] md

---
 .../mapper/EmisTmsScanRecordMapper.xml        | 21 ++++++++++++++++++-
 .../resources/mapper/EmisWaybillMapper.xml    | 12 ++++++-----
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
index 2ca92ec9f..0d4c575ac 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
@@ -116,6 +116,8 @@
             and scan_site_code=#{params.thisSiteCode}
         </if>
 
+
+
         GROUP BY scan_site_code asc
 
     </select>
@@ -147,11 +149,22 @@
             select bill_code from emis_tms_scan_record where scan_site_code=#{params.thisSiteCode} and scan_type=#{params.thisSiteScanType}
             )
         </if>
+
+        <if test="params.isPrivQuery != null and params.isPrivQuery ='T'">
+            and (
+            create_site=#{params.privSiteCode}
+            )
+        </if>
+
+
     </select>
 
 
 
 
+
+
+
     <!-- 获取订单最后一条扫描记录 -->
     <select id="selectLastRecordByBillCode" parameterType="string" resultMap="EmisTmsScanRecordResult">
         select id, bill_code, order_sn, scan_type, pre_or_next_station, pre_or_next_station_code, pre_or_next_station_phone, pre_or_next_man_code, pre_or_next_man_phone, scan_date, scan_man_code, scan_man_phone, scan_man, pre_or_next_man, scan_site, scan_site_code, scan_site_phone, scan_weight, weight, dest_site_code, dest_code, dispatch_or_send_man, dispatch_or_send_man_code, dispatch_or_send_man_phone, sign_date, sign_man, sign_site, sign_site_code, record_man, record_man_code, record_man_phone, record_site_code, car_no, bag_no, truck_man, truck_code, data_from, pic_url, status, del_flag, create_by, create_time, update_by, update_time, remark, update_site, create_site
@@ -255,10 +268,16 @@
 <!--                and pic_url is null-->
 <!--            </if>-->
 
-            <if test="params.isSubBill != null and params.isSubBill = 1">
+
+            <if test="params.isPrivQuery != null and params.isPrivQuery ='T'">
+                and (
+                create_site=#{params.privSiteCode}
+                )
             </if>
 
 
+
+
         </where>
         ORDER BY
         <if test="params.orderSnSortList != null and params.orderSnSortList.size >0  ">
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index f384c9e71..b47aa2dbb 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -469,18 +469,18 @@
                 and bill_code not in( select bill_code from emis_tms_pack_dtl  where del_flag='0'  )
             </if>
 
-            <if test="params.innerQuery != null">
 
+            <if test="params.isPrivQuery != null and params.isPrivQuery ='T'">
                 and (
-                    create_site=#{params.currentSiteCode}
-                    or salesmen=#{params.currentEmpName}
-                    or payee=#{params.currentEmpName}
+                    create_site=#{params.privSiteCode}
+                    or salesmen=#{params.privEmpCode}
+                    or payee=#{params.privEmpName}
                 )
-
             </if>
 
         </where>
 
+
         ORDER BY
         <if test="params.orderSnSortList != null and params.orderSnSortList.size >0  ">
              FIELD
@@ -499,6 +499,8 @@
         create_time desc
     </select>
 
+    <!--  通用权限判断 参数 isPrivQuery  -->
+
     <select id="selectEmisWaybillById" parameterType="Long" resultMap="EmisWaybillResult">
         select id, order_sn, cust_order_id, bill_code, bill_code_sub, order_status, waybill_status, order_type, order_date, user_id, customer_code, customer_name, open_id, receive_name, receive_company, receive_mobile, receive_tel, receive_country, receive_province, receive_city, receive_county, receive_town, receive_address, receive_postcode, receive_pcd, send_name, send_company, send_mobile, send_tel, send_country, send_province, send_city, send_county, send_town, send_address, send_postcode, send_pcd, payment_type, calc_fee_type, cust_no, cust_name, trans_line_type, product_type, time_type, meter_type, carry_type, customs_clear, customs_eclaration, estimate_date, pack_type, dispatch_method, pickup_method, pick_start_date, pick_finish_date, pick_fail_reason, into_warehouse_code, into_warehouse_name, into_warehouse_address, into_warehouse_contact, into_warehouse_phone, into_warehouse_bill_code, warehouse_in_no, customer_delivery_begin_time, customer_delivery_end_time, goods_type, goods_info, goods_pics, bl_prepare_in_freight, prepare_in_est_fee, prepare_in_real_fee, prepare_in_express, prepare_in_bill_code, prepare_in_remark, prepare_in_supplier, total_weight, total_volume, parcel_qty, bill_weight, volume_weight, currency, settlement_weight, scan_weight, fee_weight, freight, real_payment_type, real_fee, bl_special_quote, bl_over_long, bl_bill, bl_bill_text, bl_over_weight, over_weight_number, fee_remaker, third_code, real_value, bl_insure, insure_value, insure_value_currency, insure_fee_currency, insure_fee, insure_remark, insure_site_code, insure_date, bl_print, print_man_code, print_site, print_date, print_count, bl_disp_fd, transfer_code, transfer_billcode, disp_fd_date, disp_fd_reason, current_site_code, next_site_code, last_site_code, register_site_code, register_date, register_man_code, take_piece_employee_code, send_site_code, send_center_code, send_date, dispatch_man_code, dispatch_date, dispatch_site_code, produce_bill_date, produce_bill_site_code, produce_bill_man_code, destination_code, destination_province, destination_city, destination_county, dispatch_underling_site_code, destination_center_code, market_man_code, payee, salesmen, operate_employee_code, bl_is_question, problem_type, problem_cause, problem_delay_days, bl_message, bl_accept_message, bl_gen_subbill, bl_sign, sign_man, sign_man_code, sign_site_code, sign_date, bill_pic_send_rmk, bill_pic_dispatch_rmk, timezone_offset, payment_status, payment_date, payment_remark, order_remark, data_from, bl_special_goods, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
         from emis_waybill a