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

fix(用户组和权限): 用户组显示UUID的问题

This commit is contained in:
shiziyuan9527 2021-06-01 17:04:50 +08:00 committed by 刘瑞斌
parent c800f4d836
commit 3b3cf79efc
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
backend/src/main/java/io/metersphere/service/GroupService.java
View File

@ -126,6 +126,11 @@ public class GroupService {
} }
} }
groupMapper.deleteByPrimaryKey(id); groupMapper.deleteByPrimaryKey(id);
UserGroupExample userGroupExample = new UserGroupExample();
userGroupExample.createCriteria().andGroupIdEqualTo(id);
userGroupMapper.deleteByExample(userGroupExample);
UserGroupPermissionExample example = new UserGroupPermissionExample(); UserGroupPermissionExample example = new UserGroupPermissionExample();
example.createCriteria().andGroupIdEqualTo(id); example.createCriteria().andGroupIdEqualTo(id);
userGroupPermissionMapper.deleteByExample(example); userGroupPermissionMapper.deleteByExample(example);

5
frontend/src/business/components/settings/project/Member.vue
View File

@ -35,7 +35,7 @@
<el-dialog :close-on-click-modal="false" :title="$t('member.modify')" :visible.sync="updateVisible" width="30%" :destroy-on-close="true" <el-dialog :close-on-click-modal="false" :title="$t('member.modify')" :visible.sync="updateVisible" width="30%" :destroy-on-close="true"
@close="handleClose"> @close="handleClose" v-loading="dialogResult.loading">
<el-form :model="form" label-position="right" label-width="100px" size="small" ref="updateUserForm"> <el-form :model="form" label-position="right" label-width="100px" size="small" ref="updateUserForm">
<el-form-item label="ID" prop="id"> <el-form-item label="ID" prop="id">
<el-input v-model="form.id" autocomplete="off" :disabled="true"/> <el-input v-model="form.id" autocomplete="off" :disabled="true"/>
@ -103,6 +103,7 @@ export default {
return { return {
condition: {}, condition: {},
result: {}, result: {},
dialogResult: {},
tableData: [], tableData: [],
screenHeight: 'calc(100vh - 255px)', screenHeight: 'calc(100vh - 255px)',
currentPage: 1, currentPage: 1,
@ -143,7 +144,7 @@ export default {
this.updateVisible = true; this.updateVisible = true;
this.form = Object.assign({}, row); this.form = Object.assign({}, row);
let groupIds = this.form.groups.map(r => r.id); let groupIds = this.form.groups.map(r => r.id);
this.result = this.$post('/user/group/list', {type: GROUP_PROJECT, resourceId: getCurrentOrganizationId()}, response => { this.dialogResult = this.$post('/user/group/list', {type: GROUP_PROJECT, resourceId: getCurrentOrganizationId()}, response => {
this.$set(this.form, "allgroups", response.data); this.$set(this.form, "allgroups", response.data);
}) })
// 编辑使填充角色信息 // 编辑使填充角色信息