test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

refactor(系统设置): 权限增加license

This commit is contained in:
wxg0103 2024-05-29 15:50:18 +08:00 committed by 刘瑞斌
parent 1d91d6adc7
commit 8b30364300
3 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
backend/services/case-management/src/main/java/io/metersphere/functional/service/FunctionalCaseDemandService.java
View File

@ -211,6 +211,9 @@ public class FunctionalCaseDemandService {
*/
public void deleteDemand(String id) {
FunctionalCaseDemand functionalCaseDemandInDb = functionalCaseDemandMapper.selectByPrimaryKey(id);
if (functionalCaseDemandInDb == null) {
return;
}
FunctionalCaseDemandExample functionalCaseDemandExample = new FunctionalCaseDemandExample();
functionalCaseDemandExample.createCriteria().andParentEqualTo(functionalCaseDemandInDb.getDemandId());
List<FunctionalCaseDemand> functionalCaseDemands = functionalCaseDemandMapper.selectByExample(functionalCaseDemandExample);

24
backend/services/system-setting/src/main/resources/permission.json
View File

@ -84,7 +84,8 @@
"id": "SYSTEM_TEST_RESOURCE_POOL:READ"
},
{
"id": "SYSTEM_TEST_RESOURCE_POOL:READ+ADD"
"id": "SYSTEM_TEST_RESOURCE_POOL:READ+ADD",
"license": true
},
{
"id": "SYSTEM_TEST_RESOURCE_POOL:READ+UPDATE"
@ -126,27 +127,33 @@
},
{
"id": "SYSTEM_PARAMETER_SETTING_DISPLAY:READ",
"name": "permission.system_parameter_setting_display.read"
"name": "permission.system_parameter_setting_display.read",
"license": true
},
{
"id": "SYSTEM_PARAMETER_SETTING_DISPLAY:READ+UPDATE",
"name": "permission.system_parameter_setting_display.update"
"name": "permission.system_parameter_setting_display.update",
"license": true
},
{
"id": "SYSTEM_PARAMETER_SETTING_AUTH:READ",
"name": "permission.system_parameter_setting_auth.read"
"name": "permission.system_parameter_setting_auth.read",
"license": true
},
{
"id": "SYSTEM_PARAMETER_SETTING_AUTH:READ+ADD",
"name": "permission.system_parameter_setting_auth.add"
"name": "permission.system_parameter_setting_auth.add",
"license": true
},
{
"id": "SYSTEM_PARAMETER_SETTING_AUTH:READ+UPDATE",
"name": "permission.system_parameter_setting_auth.update"
"name": "permission.system_parameter_setting_auth.update",
"license": true
},
{
"id": "SYSTEM_PARAMETER_SETTING_AUTH:READ+DELETE",
"name": "permission.system_parameter_setting_auth.delete"
"name": "permission.system_parameter_setting_auth.delete",
"license": true
},
{
"id": "SYSTEM_PARAMETER_SETTING_MEMORY_CLEAN:READ",
@ -168,7 +175,8 @@
{
"id": "SYSTEM_AUTH:READ+UPDATE"
}
]
],
"license": true
},
{
"id": "SYSTEM_LOG",

2
frontend/src/components/pure/ms-table/select-all.vue
View File

@ -63,7 +63,7 @@
// 获取数据第一层级的ids，用来判断全选或者半选
const firstLevelAllIds = computed(() => {
if (isHasChildren) {
if (isHasChildren.value) {
return props.currentData.map((item) => item[props.rowKey]);
}
return [];