diff --git a/frontend/src/business/components/settings/system/EditUser.vue b/frontend/src/business/components/settings/system/EditUser.vue
index 536f2c9fe8..4893121099 100644
--- a/frontend/src/business/components/settings/system/EditUser.vue
+++ b/frontend/src/business/components/settings/system/EditUser.vue
@@ -214,6 +214,18 @@ export default {
     },
     removeGroup(item) {
       let index = this.form.groups.indexOf(item);
+      let isRemove = this.checkRemove(item,index);
+      if (!isRemove) {
+        return;
+      }
+      if (index !== -1) {
+        this.form.groups.splice(index, 1)
+      }
+      if (this.form.groups.length < this.userGroup.length) {
+        this.btnAddRole = false;
+      }
+    },
+    checkRemove(item,index){
       let type = item.type.split("+")[1];
       if (type === this.ws) {
         let isHaveWorkspace = 0;
@@ -223,6 +235,9 @@ export default {
             continue;
           }
           let group = this.form.groups[i];
+          if (!group.type) {
+            continue;
+          }
           let _type = group.type.split("+")[1];
           if (_type === this.ws) {
             isHaveWorkspace += 1;
@@ -232,16 +247,11 @@ export default {
           }
         }
         if (isHaveWorkspace === 0 && isHaveProject >0 ) {
-          this.$message.warning("不符合删除条件")
-          return;
+          this.$message.warning(this.$t('commons.not_eligible_for_deletion'))
+          return false;
         }
       }
-      if (index !== -1) {
-        this.form.groups.splice(index, 1)
-      }
-      if (this.form.groups.length < this.userGroup.length) {
-        this.btnAddRole = false;
-      }
+      return true;
     },
     addGroup(validForm) {
       this.$refs[validForm].validate(valid => {
@@ -312,22 +322,7 @@ export default {
         if (data) {
           this._setResource(data, index, type);
           if(isHaveWorkspace === false ){
-            this.result = this.$get('/workspace/list/resource/' + id + "/WORKSPACE", res => {
-              let data = res.data;
-              if (data) {
-                let roleInfo = {};
-                roleInfo.selects = [];
-                let ids = this.form.groups.map(r => r.type);
-                ids.forEach(id => {
-                  roleInfo.selects.push(id);
-                })
-                roleInfo.type = "ws_member+WORKSPACE";
-                roleInfo.ids = [];
-                let groups = this.form.groups;
-                groups.push(roleInfo);
-                this._setResource(data, index+1, 'WORKSPACE');
-              }
-            })
+            this.addWorkspaceGroup(id,index);
           }
         }
       })
@@ -343,6 +338,24 @@ export default {
         default:
       }
     },
+    addWorkspaceGroup(id,index){
+      this.result = this.$get('/workspace/list/resource/' + id + "/WORKSPACE", res => {
+        let data = res.data;
+        if (data) {
+          let roleInfo = {};
+          roleInfo.selects = [];
+          let ids = this.form.groups.map(r => r.type);
+          ids.forEach(id => {
+            roleInfo.selects.push(id);
+          })
+          roleInfo.type = "ws_member+WORKSPACE";
+          roleInfo.ids = [];
+          let groups = this.form.groups;
+          groups.push(roleInfo);
+          this._setResource(data, index+1, 'WORKSPACE');
+        }
+      })
+    },
     getLabel(index) {
       let a = index + 1;
       return this.$t('commons.group') + a;
@@ -352,14 +365,7 @@ export default {
 </script>
 
 <style scoped>
-/*.edit-user-dialog >>> .el-dialog__body {
-  padding-bottom: 0;
-  padding-left: 0;
-}*/
 
-/*.edit-user-dialog >>> .el-dialog__footer {
-  padding-top: 0;
-}*/
 .form-input {
   width: 80%;
 }
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index 556ba8d50d..b994f3dcf3 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -445,6 +445,7 @@ export default {
     delete_all_version: 'All versions',
     change_password_tips: 'Your password is the initial system password, please change it as soon as possible',
     ui: 'UI TEST',
+    not_eligible_for_deletion:'Not Eligible For Deletion'
   },
   login: {
     normal_Login: "Normal Login",
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index e966095e97..70c53532da 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -447,6 +447,7 @@ export default {
     delete_all_version: '全部版本',
     change_password_tips: '您的密码是系统初始密码，请尽快修改密码',
     ui: 'UI 测试',
+    not_eligible_for_deletion:'不符合删除条件'
   },
   login: {
     normal_Login: "普通登录",
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index 1363584940..0d5340746c 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -447,6 +447,7 @@ export default {
     delete_all_version: '全部版本',
     change_password_tips: '您的密碼是系統初始密碼，請盡快修改密碼',
     ui: 'UI 測試',
+    not_eligible_for_deletion:'不符合删除條件'
   },
   login: {
     normal_Login: "普通登錄",