From fad49bd4bf560caae3e66e8fc96feb8cf5849585 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Wed, 2 Jun 2021 17:23:27 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20admin=E7=94=A8=E6=88=B7=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E6=97=A0=E6=B3=95=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/system/user/index.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/frontend/src/views/system/user/index.vue b/frontend/src/views/system/user/index.vue
index 32a9ff2ae0..9c8ceae97f 100644
--- a/frontend/src/views/system/user/index.vue
+++ b/frontend/src/views/system/user/index.vue
@@ -187,6 +187,7 @@ export default {
           show: this.checkPermission(['user:edit'])
         }, {
           label: this.$t('commons.delete'), icon: 'el-icon-delete', type: 'danger', click: this.del,
+          disabled: this.btnDisabled,
           show: this.checkPermission(['user:del'])
         }, {
           label: this.$t('member.edit_password'), icon: 'el-icon-s-tools', type: 'success', click: this.editPassword,
@@ -489,6 +490,9 @@ export default {
       allRoles().then(res => {
         this.roles = res.data
       })
+    },
+    btnDisabled(row) {
+      return row.userId === 1
     }
   }
 }

From 5b29f93eff1cb3b2701b4e1af894fb91bba1ed31 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Wed, 2 Jun 2021 17:34:56 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E7=A6=81=E6=AD=A2=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9admin=E7=9A=84Id=E3=80=81=E7=8A=B6=E6=80=81=E4=BB=A5?=
 =?UTF-8?q?=E5=8F=8A=E8=A7=92=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/system/user/form.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/frontend/src/views/system/user/form.vue b/frontend/src/views/system/user/form.vue
index 27d9851ed5..305c8d6fb1 100644
--- a/frontend/src/views/system/user/form.vue
+++ b/frontend/src/views/system/user/form.vue
@@ -2,7 +2,7 @@
   <layout-content :header="formType=='add' ? $t('user.create') : $t('user.modify')" back-name="system-user">
     <el-form ref="createUserForm" :model="form" :rules="rule" size="small" label-width="auto" label-position="right">
       <el-form-item label="ID" prop="username">
-        <el-input v-model="form.username" />
+        <el-input v-model="form.username" :disabled="formType !== 'add'" />
       </el-form-item>
       <el-form-item :label="$t('commons.phone')" prop="phone">
         <el-input v-model="form.phone" />
@@ -27,7 +27,7 @@
         </el-radio-group>
       </el-form-item>
       <el-form-item :label="$t('commons.status')">
-        <el-radio-group v-model="form.enabled" style="width: 140px">
+        <el-radio-group v-model="form.enabled" :disabled="formType !== 'add' && form.isAdmin" style="width: 140px">
           <el-radio :label="1">{{ $t('commons.enable') }}</el-radio>
           <el-radio :label="0">{{ $t('commons.disable') }}</el-radio>
         </el-radio-group>
@@ -47,6 +47,7 @@
         <el-select
           v-model="form.roleIds"
           style="width: 100%"
+          :disabled="formType !== 'add' && form.isAdmin"
           multiple
           :placeholder="$t('commons.please_select')"
           @remove-tag="deleteTag"