From aeed674cb1c6a94f2b1ff7c2e3c020b0a17cc2e4 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Fri, 17 Jun 2022 14:52:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/project/mapper/xml/NcrTrackMapper.xml     | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/NcrTrackMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/NcrTrackMapper.xml
index 6fb360f6a..cd15845a4 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/NcrTrackMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/NcrTrackMapper.xml
@@ -43,10 +43,10 @@
             plb.id =#{ncrTrackVO.projectLibraryId}
             and
         </if>
-        <if test="ncrTrackVO.userId != null and ncrTrackVO.userId != ''">
+        <!--<if test="ncrTrackVO.userId != null and ncrTrackVO.userId != ''">
             ptid.user_id =#{ncrTrackVO.userId}
             and
-        </if>
+        </if>-->
         <if test="ncrTrackVO.serialNumber != null and ncrTrackVO.serialNumber != ''">
             pli.serial_number like concat(concat('%',#{ncrTrackVO.serialNumber}),'%')
             and
@@ -80,6 +80,13 @@
         or prehomo_flow_task_status =#{ncrTrackVO.inconformity} or prehomo_flow_task_status =#{ncrTrackVO.track}
         or verify_flow_task_status =#{ncrTrackVO.inconformity} or verify_flow_task_status =#{ncrTrackVO.track}
         )
+        <if test="ncrTrackVO.userId != null and ncrTrackVO.userId != ''">
+            and (pli.regulation_owner_id =#{ncrTrackVO.userId}
+            or pli.homologation_engineer_id =#{ncrTrackVO.userId}
+            or pli.engineering_interface_person =#{ncrTrackVO.userId}
+            or ptid.user_id =#{ncrTrackVO.userId}
+            )
+        </if>
         order by pli.create_time desc
 
     </select>