From b69fb099d0655aba5f37643eab1eab8b207736a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Thu, 28 Sep 2023 16:29:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E4=BF=AE=E6=94=B9=E5=92=8C=E5=88=A0=E9=99=A4=E6=9D=83?=
 =?UTF-8?q?=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/project/service/impl/NcrTrackServiceImpl.java    | 5 +++--
 .../service/impl/ProjectLawsInventoryEOServiceImpl.java      | 5 ++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

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 91c89f8d2..3b16afe41 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
@@ -392,8 +392,9 @@ public class NcrTrackServiceImpl extends ServiceImpl<NcrTrackMapper, NcrTrackVO>
             trackVOList = parameterQuery(ncrTrackVO, trackVOList);
             //表头排序
             heartSort(ncrTrackVO, trackVOList);
-
-
+            for (NcrTrackVO trackVO : trackVOList) {
+                trackVO.setAdministrator(administrator ? "true" : "false");
+            }
             return trackVOList;
         }
     }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
index d68ac9d55..7acebb8ff 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
@@ -10248,6 +10248,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 	@Override
 	public List<Map<String,Object>> queryNotComplianList(Map<String, Object> params) {
+		//如果当前登录用户是系统管理员角色，可以查看所有的数据
+		boolean administrator = this.sysUserService.isAdministrator();
 		String cut = (String) params.get("cut");
 
 		List<String> complianceFlowStatusList = new ArrayList<>();
@@ -10311,6 +10313,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				dataMap.put("createTime",dataMap.get("createTime"));
 				//更新时间
 				dataMap.put("updateTime",dataMap.get("updateTime"));
+				
+				dataMap.put("administrator",administrator ? "true" : "false");
 
 				String dutyTerritory = (String) dataMap.get("dutyTerritory");
 				if(StringUtils.isNotEmpty(dutyTerritory)){
@@ -10436,7 +10440,6 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		//表头排序
 		heartSort(params, result);
 
-
 		return result;
 	}