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> mapList = getNewData(params, cut); + List> mapList = getNewData(params, cut, administrator); if(ObjectUtils.isNotEmpty(mapList)){ result.addAll(mapList); } @@ -10587,7 +10587,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl> getNewData(Map params, String cut) { + private List> getNewData(Map params, String cut,boolean administrator) { //新数据 LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.like(ProblemManagementEO::getProjectId,params.get("projectLibraryId")); @@ -10659,6 +10659,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl 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') }} - + {{ $t('edit') }} - {{ $t('deleteLib') }} @@ -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') }} - {{ $t('edit') }} - {{ $t('deleteLib') }} @@ -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) {