Merge pull request 'demand: TMS系统 - 运单补打印 -不区分网点权限和总部权限,运单补打印 取件员 查询与选择员工姓名匹配的所有网点的 开单数据' (#206) from develop into master

Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/206
This commit is contained in:
heyu 2025-10-21 19:11:44 +08:00
commit 88cecb4875

View File

@ -2528,7 +2528,7 @@
<if test="sendCompany != null and sendCompany != ''"> and a.send_company like concat('%', #{sendCompany}, '%')</if>
<if test="enterpriseName != null and enterpriseName != ''"> and a.enterprise_name like concat('%', #{enterpriseName}, '%')</if>
<if test="enterpriseTaxId != null and enterpriseTaxId != ''"> and a.enterprise_tax_id like concat('%', #{enterpriseTaxId}, '%')</if>
<if test="takePieceEmployeeCode != null and takePieceEmployeeCode != ''"> and a.take_piece_employee_code=#{takePieceEmployeeCode}</if>
<if test="takePieceEmployeeCode != null and takePieceEmployeeCode != ''"> and exists (select 1 from sys_user su1, sys_user su2 where su1.emp_code = #{takePieceEmployeeCode} and su2.emp_code = a.take_piece_employee_code and su1.emp_name = su2.emp_name and su1.del_flag='0' and su2.del_flag='0')</if>
<if test="operateEmployeeCode != null and operateEmployeeCode != ''"> and a.operate_employee_code=#{operateEmployeeCode}</if>
<if test="registerManCode != null and registerManCode != ''"> and register_man_code= #{registerManCode}</if>