From f0420251442ac6f7bfb6beafa37ad045b4f6478a Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 31 十二月 2025 15:49:05 +0800
Subject: [PATCH] 报工多工序，用户多工序修改
---
north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml b/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
index 636a063..8cf8c23 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
@@ -69,6 +69,7 @@
<!-- 鏌ヨ褰撳墠宸ュ簭鐨勮〃澶存暟鎹�-->
<select id="AddSelectLastWorkMp" resultMap="reportingWorkMap">
select o.order_id,
+ o.batch,
fc.production_id,
fc.process_id as 'processIdFirst',
o.customer_id,
@@ -104,7 +105,13 @@
</select>
<select id="SelectWorkBasicTeamsMp">
- select id,login_name,user_name,address from erp_user_info.`user` WHERE address=#{process}
+ select id,login_name,user_name,address from erp_user_info.`user`
+ where
+ address is not null and address != ''
+ and (
+ (JSON_VALID(address) and JSON_CONTAINS(address,CONCAT('"', #{process}, '"') ))
+ or (not JSON_VALID(address) and address = #{process})
+ )
</select>
<!-- 鏌ヨ娴佺▼鍗″伐鑹烘祦绋�-->
--
Gitblit v1.8.0