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

fix(项目设置): 修复项目类型用户组保存问题

This commit is contained in:
song-cc-rock 2024-07-24 16:47:43 +08:00 committed by 刘瑞斌
parent c591162490
commit 0eadf44495
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
backend/services/system-setting/src/main/java/io/metersphere/system/service/BaseUserRolePermissionService.java
View File

@ -1,16 +1,16 @@
package io.metersphere.system.service; package io.metersphere.system.service;
import io.metersphere.system.dto.sdk.request.PermissionSettingUpdateRequest;
import io.metersphere.system.domain.UserRolePermission; import io.metersphere.system.domain.UserRolePermission;
import io.metersphere.system.domain.UserRolePermissionExample; import io.metersphere.system.domain.UserRolePermissionExample;
import io.metersphere.system.dto.sdk.request.PermissionSettingUpdateRequest;
import io.metersphere.system.mapper.UserRolePermissionMapper; import io.metersphere.system.mapper.UserRolePermissionMapper;
import io.metersphere.system.uid.IDGenerator;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.BooleanUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import io.metersphere.system.uid.IDGenerator;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
@ -56,10 +56,10 @@ public class BaseUserRolePermissionService {
public void updatePermissionSetting(PermissionSettingUpdateRequest request) { public void updatePermissionSetting(PermissionSettingUpdateRequest request) {
List<PermissionSettingUpdateRequest.PermissionUpdateRequest> permissions = request.getPermissions(); List<PermissionSettingUpdateRequest.PermissionUpdateRequest> permissions = request.getPermissions();
// 先删除 // 先删除 (排除内置基本信息用户组)
UserRolePermissionExample userGroupPermissionExample = new UserRolePermissionExample(); UserRolePermissionExample userGroupPermissionExample = new UserRolePermissionExample();
userGroupPermissionExample.createCriteria() userGroupPermissionExample.createCriteria()
.andRoleIdEqualTo(request.getUserRoleId()); .andRoleIdEqualTo(request.getUserRoleId()).andPermissionIdNotEqualTo("PROJECT_BASE_INFO:READ");
userRolePermissionMapper.deleteByExample(userGroupPermissionExample); userRolePermissionMapper.deleteByExample(userGroupPermissionExample);
// 再新增 // 再新增

2
frontend/src/views/project-management/projectAndPermission/menuManagement/locale/en-US.ts
View File

@ -38,7 +38,7 @@ export default {
'project.menu.SYNC_ENABLE': 'Status', 'project.menu.SYNC_ENABLE': 'Status',
'project.menu.MECHANISM': 'Interface Test Update Synchronization Rule', 'project.menu.MECHANISM': 'Interface Test Update Synchronization Rule',
'project.menu.row1': 'The system displays data that meets the rules in My To-Do List - To Be Updated', 'project.menu.row1': 'The system displays data that meets the rules in My To-Do List - To Be Updated',
'project.menu.row2': 'Synchronize defects created on the platform to third-party project management platforms', 'project.menu.row2': 'Bidirectional synchronization with defects of third-party project management platforms',
'project.menu.row3': 'Add test cases to the public test case library for sharing', 'project.menu.row3': 'Add test cases to the public test case library for sharing',
'project.menu.row4': 'Associate test cases with third-party project management platforms', 'project.menu.row4': 'Associate test cases with third-party project management platforms',
'project.menu.row5': 'project.menu.row5':

2
frontend/src/views/project-management/projectAndPermission/menuManagement/locale/zh-CN.ts
View File

@ -35,7 +35,7 @@ export default {
'project.menu.SYNC_ENABLE': '状态', 'project.menu.SYNC_ENABLE': '状态',
'project.menu.MECHANISM': '接口测试待更新同步规则', 'project.menu.MECHANISM': '接口测试待更新同步规则',
'project.menu.row1': '系统根据设定的规则将符合的数据展示在我的待办-待更新列表', 'project.menu.row1': '系统根据设定的规则将符合的数据展示在我的待办-待更新列表',
'project.menu.row2': '将平台创建的缺陷同步至第三方项目管理平台', 'project.menu.row2': '与第三方项目管理平台的缺陷进行双向同步',
'project.menu.row3': '可将用例添加至公共用例库共用', 'project.menu.row3': '可将用例添加至公共用例库共用',
'project.menu.row4': '可将用例与第三方项目管理平台进行关联', 'project.menu.row4': '可将用例与第三方项目管理平台进行关联',
'project.menu.row5': '评审活动中用例发生变更，用例状态自动切换为重新提审', 'project.menu.row5': '评审活动中用例发生变更，用例状态自动切换为重新提审',