From 63bfd2c91c5237e88b9f234c8b4f9bd051b7fb3b 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 17:08:27 +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

---
 .../service/impl/ProjectLawsInventoryEOServiceImpl.java   | 7 ++++---
 .../views/projectManagement/components/nonConformance.vue | 8 +++++---
 .../projectManagement/projectNonConformance/index.vue     | 6 ++++--
 3 files changed, 13 insertions(+), 8 deletions(-)

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 7acebb8ff..ecf1766f9 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
@@ -10313,7 +10313,7 @@ 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");
@@ -10431,7 +10431,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 		}
 		//新数据
-		List<Map<String, Object>> mapList = getNewData(params, cut);
+		List<Map<String, Object>> mapList = getNewData(params, cut, administrator);
 		if(ObjectUtils.isNotEmpty(mapList)){
 			result.addAll(mapList);
 		}
@@ -10587,7 +10587,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 	}
 
 	@NotNull
-	private List<Map<String, Object>> getNewData(Map<String, Object> params, String cut) {
+	private List<Map<String, Object>> getNewData(Map<String, Object> params, String cut,boolean administrator) {
 		//新数据
 		LambdaQueryWrapper<ProblemManagementEO> wrapper = new LambdaQueryWrapper<>();
 		wrapper.like(ProblemManagementEO::getProjectId,params.get("projectLibraryId"));
@@ -10659,6 +10659,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			map.put("uuid",problemManagementEO.getId());
 			map.put("id",problemManagementEO.getId());
 			map.put("flag",DataEnum.NEW.getValue());
+			map.put("administrator",administrator ? "true" : "false");
 
 			List<DictModel> dictModelList = problemTypeList.stream().filter(e -> e.getValue().equals(problemManagementEO.getProblemType())).collect(Collectors.toList());
 
diff --git a/jero-web/src/views/projectManagement/components/nonConformance.vue b/jero-web/src/views/projectManagement/components/nonConformance.vue
index 70b02c278..808cc8872 100644
--- a/jero-web/src/views/projectManagement/components/nonConformance.vue
+++ b/jero-web/src/views/projectManagement/components/nonConformance.vue
@@ -173,11 +173,11 @@
              @click="detil(record)">
                 {{ $t('See') }}
               </a>
-              <a class="text-operation" v-if="record.flag == 'NEW'" v-has="'ncrTrack:edit'"
-                 @click="edit(record)">
+          <a class="text-operation" v-if="record.flag == 'NEW' && record.createBy == userInfo().username" v-has="'ncrTrack:edit'"
+             @click="edit(record)">
                 {{ $t('edit') }}
               </a>
-              <a class="text-operation" v-if="record.flag == 'NEW'" v-has="'ncrTrack:delete'"
+              <a class="text-operation" v-if="record.flag == 'NEW' && (record.administrator == 'true' || record.createBy == userInfo().username)" v-has="'ncrTrack:delete'"
                  @click="deleteLib(record)">
                 {{ $t('deleteLib') }}
               </a>
@@ -211,6 +211,7 @@ import addModel from './addModelconformance'
 import moment from 'moment'
 import detilModel from './detilModel'
 import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
+import { mapGetters } from 'vuex'
 
 export default {
   name: 'projectNonConformance',
@@ -355,6 +356,7 @@ export default {
     }
   },
   methods: {
+    ...mapGetters(['userInfo']),
     getFirstLevelDutyTerritory() {
       getAction('/sys/dictItem/getFirstLevelDutyTerritory', {}).then((res) => {
         if (res.success) {
diff --git a/jero-web/src/views/projectManagement/projectNonConformance/index.vue b/jero-web/src/views/projectManagement/projectNonConformance/index.vue
index 81519f9a6..cf457048e 100644
--- a/jero-web/src/views/projectManagement/projectNonConformance/index.vue
+++ b/jero-web/src/views/projectManagement/projectNonConformance/index.vue
@@ -173,11 +173,11 @@
              @click="detil(record)">
                 {{ $t('See') }}
               </a>
-              <a class="text-operation" v-if="record.flag == 'NEW'" v-has="'ncrTrack:edit'"
+              <a class="text-operation" v-if="record.flag == 'NEW' && record.createBy == userInfo().username" v-has="'ncrTrack:edit'"
                  @click="edit(record)">
                 {{ $t('edit') }}
               </a>
-              <a class="text-operation" v-if="record.flag == 'NEW'" v-has="'ncrTrack:delete'"
+              <a class="text-operation" v-if="record.flag == 'NEW' && (record.administrator == 'true' || record.createBy == userInfo().username)" v-has="'ncrTrack:delete'"
                  @click="deleteLib(record)">
                 {{ $t('deleteLib') }}
               </a>
@@ -211,6 +211,7 @@
   import detilModel from './moudles/detilModel'
   import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
   import moment from 'moment'
+  import { mapGetters } from 'vuex'
 
   export default {
     name: 'projectNonConformance',
@@ -355,6 +356,7 @@
       }
     },
     methods: {
+      ...mapGetters(['userInfo']),
       getFirstLevelDutyTerritory() {
         getAction('/sys/dictItem/getFirstLevelDutyTerritory', {}).then((res) => {
           if (res.success) {