WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改问题管理修改和删除权限

Browse Source
This commit is contained in:
高嵩
2023-09-28 17:08:27 +08:00
parent b69fb099d0
commit 63bfd2c91c
3 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+4 -3
View File
@@ -10313,7 +10313,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
dataMap.put("createTime",dataMap.get("createTime")); dataMap.put("createTime",dataMap.get("createTime"));
//更新时间 //更新时间
dataMap.put("updateTime",dataMap.get("updateTime")); dataMap.put("updateTime",dataMap.get("updateTime"));
dataMap.put("administrator",administrator ? "true" : "false"); dataMap.put("administrator",administrator ? "true" : "false");
String dutyTerritory = (String) dataMap.get("dutyTerritory"); 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)){ if(ObjectUtils.isNotEmpty(mapList)){
result.addAll(mapList); result.addAll(mapList);
} }
@@ -10587,7 +10587,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
} }
@NotNull @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<>(); LambdaQueryWrapper<ProblemManagementEO> wrapper = new LambdaQueryWrapper<>();
wrapper.like(ProblemManagementEO::getProjectId,params.get("projectLibraryId")); wrapper.like(ProblemManagementEO::getProjectId,params.get("projectLibraryId"));
@@ -10659,6 +10659,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
map.put("uuid",problemManagementEO.getId()); map.put("uuid",problemManagementEO.getId());
map.put("id",problemManagementEO.getId()); map.put("id",problemManagementEO.getId());
map.put("flag",DataEnum.NEW.getValue()); 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()); List<DictModel> dictModelList = problemTypeList.stream().filter(e -> e.getValue().equals(problemManagementEO.getProblemType())).collect(Collectors.toList());
jero-web/src/views/projectManagement/components/nonConformance.vue
+5 -3
View File
@@ -173,11 +173,11 @@
@click="detil(record)"> @click="detil(record)">
{{ $t('See') }} {{ $t('See') }}
</a> </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)"> @click="edit(record)">
{{ $t('edit') }} {{ $t('edit') }}
</a> </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)"> @click="deleteLib(record)">
{{ $t('deleteLib') }} {{ $t('deleteLib') }}
</a> </a>
@@ -211,6 +211,7 @@ import addModel from './addModelconformance'
import moment from 'moment' import moment from 'moment'
import detilModel from './detilModel' import detilModel from './detilModel'
import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header' import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
import { mapGetters } from 'vuex'
export default { export default {
name: 'projectNonConformance', name: 'projectNonConformance',
@@ -355,6 +356,7 @@ export default {
} }
}, },
methods: { methods: {
...mapGetters(['userInfo']),
getFirstLevelDutyTerritory() { getFirstLevelDutyTerritory() {
getAction('/sys/dictItem/getFirstLevelDutyTerritory', {}).then((res) => { getAction('/sys/dictItem/getFirstLevelDutyTerritory', {}).then((res) => {
if (res.success) { if (res.success) {
jero-web/src/views/projectManagement/projectNonConformance/index.vue
+4 -2
View File
@@ -173,11 +173,11 @@
@click="detil(record)"> @click="detil(record)">
{{ $t('See') }} {{ $t('See') }}
</a> </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)"> @click="edit(record)">
{{ $t('edit') }} {{ $t('edit') }}
</a> </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)"> @click="deleteLib(record)">
{{ $t('deleteLib') }} {{ $t('deleteLib') }}
</a> </a>
@@ -211,6 +211,7 @@
import detilModel from './moudles/detilModel' import detilModel from './moudles/detilModel'
import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header' import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
import moment from 'moment' import moment from 'moment'
import { mapGetters } from 'vuex'
export default { export default {
name: 'projectNonConformance', name: 'projectNonConformance',
@@ -355,6 +356,7 @@
} }
}, },
methods: { methods: {
...mapGetters(['userInfo']),
getFirstLevelDutyTerritory() { getFirstLevelDutyTerritory() {
getAction('/sys/dictItem/getFirstLevelDutyTerritory', {}).then((res) => { getAction('/sys/dictItem/getFirstLevelDutyTerritory', {}).then((res) => {
if (res.success) { if (res.success) {