From f3e4607c6831923fc1966c70d90df4a743abbeb9 Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Fri, 17 Apr 2026 11:14:12 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20=20=20=20=20TMS=E7=B3=BB=E7=BB=9F=20-?=
 =?UTF-8?q?=20=E7=AD=BE=E6=94=B6=E8=AE=B0=E5=BD=95=E6=9F=A5=E8=AF=A2=20-?=
 =?UTF-8?q?=20=E6=9F=A5=E8=AF=A2=E6=94=AF=E6=8C=81=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E2=80=9C=E6=B4=BE=E4=BB=B6=E5=91=98=E2=80=9D=20=EF=BC=8C?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=94=AF=E6=8C=81=E6=8C=89=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E7=8A=B6=E6=80=81=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/EmisTmsScanRecordMapper.xml   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
index b08765439..8bdbff063 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
@@ -278,7 +278,9 @@
 
 
     <select id="selectEmisTmsScanRecordList" parameterType="EmisTmsScanRecord" resultMap="EmisTmsScanRecordResult">
-        select id, bill_code, main_bill_code, bl_sub_bill, order_sn, scan_type, bl_last_track, 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, public_trace_info, inner_trace_info, rel_id, status, del_flag, create_by, create_time, update_by, update_time, remark, update_site, create_site
+        select id, bill_code, main_bill_code, bl_sub_bill, order_sn, scan_type, bl_last_track, 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,
+               IFNULL((select su.emp_name from sys_user su where su.emp_code = a.dispatch_or_send_man_code and su.del_flag='0' limit 1), a.dispatch_or_send_man) as 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, public_trace_info, inner_trace_info, rel_id, status, del_flag, create_by, create_time, update_by, update_time, remark, update_site, create_site
         from emis_tms_scan_record a
         <where>
 
@@ -364,7 +366,7 @@
                 and pic_url is not null
             </if>
 
-            <if test="params.isUploadPic != null and params.isUploadPic == 0 ">
+            <if test="params.isUploadPic != null and params.isUploadPic != '' and params.isUploadPic == 0 ">
                 and pic_url is null
             </if>