diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtGroupMapper.java b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtGroupMapper.java index cb100b212a..cf31b6b35b 100644 --- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtGroupMapper.java +++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtGroupMapper.java @@ -1,6 +1,5 @@ package io.metersphere.base.mapper.ext; -import io.metersphere.base.domain.Group; import io.metersphere.controller.request.group.EditGroupRequest; import io.metersphere.dto.GroupDTO; import org.apache.ibatis.annotations.Param; diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtUserGroupMapper.java b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtUserGroupMapper.java index 0fbac63038..91b1a5e314 100644 --- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtUserGroupMapper.java +++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtUserGroupMapper.java @@ -1,7 +1,6 @@ package io.metersphere.base.mapper.ext; import io.metersphere.base.domain.Group; -import io.metersphere.base.domain.Role; import io.metersphere.base.domain.User; import io.metersphere.controller.request.member.QueryMemberRequest; import io.metersphere.controller.request.organization.QueryOrgMemberRequest; diff --git a/frontend/src/business/components/settings/system/EditUser.vue b/frontend/src/business/components/settings/system/EditUser.vue index 8d04cae962..06d9242936 100644 --- a/frontend/src/business/components/settings/system/EditUser.vue +++ b/frontend/src/business/components/settings/system/EditUser.vue @@ -282,7 +282,9 @@ export default { }) }, groupType(idType) { - if (!idType) return; + if (!idType) { + return; + } return idType.split("+")[1]; }, getResource(idType, index) { diff --git a/frontend/src/business/components/settings/system/SystemWorkspace.vue b/frontend/src/business/components/settings/system/SystemWorkspace.vue index 0427594020..92f59d66e2 100644 --- a/frontend/src/business/components/settings/system/SystemWorkspace.vue +++ b/frontend/src/business/components/settings/system/SystemWorkspace.vue @@ -404,12 +404,12 @@ editMember(row) { this.dialogWsMemberUpdateVisible = true; this.memberForm = Object.assign({}, row); - console.log(this.memberForm) + // console.log(this.memberForm) let groupIds = this.memberForm.groups.map(r => r.id); this.result = this.$post('/user/group/list', {type: GROUP_WORKSPACE, resourceId: this.wsId}, response => { this.$set(this.memberForm, "allgroups", response.data); }) - console.log(this.memberForm) + // console.log(this.memberForm) // 编辑时填充角色信息 this.$set(this.memberForm, 'groupIds', groupIds); listenGoBack(this.handleClose); diff --git a/frontend/src/business/components/settings/system/group/UserGroup.vue b/frontend/src/business/components/settings/system/group/UserGroup.vue index ef87936a39..f7a96ec2a2 100644 --- a/frontend/src/business/components/settings/system/group/UserGroup.vue +++ b/frontend/src/business/components/settings/system/group/UserGroup.vue @@ -117,7 +117,7 @@ export default { this.$refs.deleteConfirm.open(row); }, copy(row) { - console.log(row); + // console.log(row); }, setPermission(row) { this.$refs.editPermission.open(row);