From 47abdbe613f00ef13f309e0ab08e7a2c17325855 Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Tue, 1 Nov 2022 17:42:31 +0800
Subject: [PATCH] =?UTF-8?q?61541=20-=20=E9=A1=B9=E7=9B=AE=E6=9C=AA?=
 =?UTF-8?q?=E7=AC=A6=E5=90=88=E9=A1=B9=E8=B7=9F=E8=B8=AA=EF=BC=8C=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E7=AE=A1=E7=90=86=E5=91=98=E6=8B=A5=E6=9C=89=E6=9C=80?=
 =?UTF-8?q?=E5=A4=A7=E6=9D=83=E9=99=90=EF=BC=8C=E5=85=B6=E5=AE=83=E8=A7=92?=
 =?UTF-8?q?=E8=89=B2=E7=9A=84=E7=94=A8=E6=88=B7=E5=8F=AA=E8=83=BD=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B=E8=B7=9F=E8=87=AA=E5=B7=B1=E7=9B=B8=E5=85=B3=E7=9A=84?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/project/mapper/xml/NcrTrackMapper.xml | 15 +++++++++------
 .../project/service/impl/NcrTrackServiceImpl.java |  5 +++++
 .../com/jero/modules/project/vo/NcrTrackVO.java   |  4 ++--
 3 files changed, 16 insertions(+), 8 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 cd15845a4..df5398987 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
@@ -80,12 +80,15 @@
         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 test="ncrTrackVO.administrator == 'false'">
+            <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>
         </if>
         order by pli.create_time desc
 
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java
index aea3c5c7e..8abfc2f32 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java
@@ -80,6 +80,11 @@ public class NcrTrackServiceImpl extends ServiceImpl<NcrTrackMapper, NcrTrackVO>
 
         ncrTrackVO.setInconformity(ReviewResultEnum.INCONFORMITY.getValue());
         ncrTrackVO.setTrack(ReviewResultEnum.TO_TRACK.getValue());
+
+        //如果当前登录用户是系统管理员角色，可以查看所有的数据
+        boolean administrator = this.sysUserService.isAdministrator();
+        ncrTrackVO.setAdministrator(administrator ? "true":"false");
+
         List<NcrTrackVO> infoList = ncrTrackMapper.getInfoList(ncrTrackVO);
         infoList = infoList.stream().distinct().collect(Collectors.toList());
         List<NcrTrackVO> trackVOList = new ArrayList<>();
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/NcrTrackVO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/NcrTrackVO.java
index 231f16f4c..5a6b0fd5c 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/NcrTrackVO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/NcrTrackVO.java
@@ -137,8 +137,8 @@ public class NcrTrackVO implements Serializable {
     private String projectTaskInventoryDetailId;
     //任务节点定义key
     private String taskDefinitionKey;
-
-
+    //是否是系统管理员角色
+    private String administrator;