From c195292d2cb67cac83f05190053cd69f52ee647e Mon Sep 17 00:00:00 2001
From: 1023byte <1843948009@qq.com>
Date: Tue, 18 Jul 2023 15:13:30 +0800
Subject: [PATCH 1/2] =?UTF-8?q?update=20=E8=A1=A8=E5=8D=95=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/tenant/index.vue | 3 ++-
 src/views/system/user/index.vue   | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/views/system/tenant/index.vue b/src/views/system/tenant/index.vue
index 711ee7f..05953e4 100644
--- a/src/views/system/tenant/index.vue
+++ b/src/views/system/tenant/index.vue
@@ -207,7 +207,8 @@ const data = reactive<PageData<TenantForm, TenantQuery>>({
     password: [
       { required: true, message: "密码不能为空", trigger: "blur" },
       { min: 5, max: 20, message: '用户密码长度必须介于 5 和 20 之间', trigger: 'blur' }
-    ]
+    ],
+    packageId: [{ required: true, message: "租户套餐不能为空", trigger: "blur" }],
   }
 });
 
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 8e3bcfa..0ea4f4f 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -231,7 +231,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="角色">
+            <el-form-item label="角色" prop="roleIds">
               <el-select v-model="form.roleIds" multiple placeholder="请选择">
                 <el-option
                   v-for="item in roleOptions"
@@ -388,6 +388,7 @@ const data = reactive<PageData<UserForm, UserQuery>>({
     userName: [{ required: true, message: "用户名称不能为空", trigger: "blur" }, { min: 2, max: 20, message: "用户名称长度必须介于 2 和 20 之间", trigger: "blur" }],
     nickName: [{ required: true, message: "用户昵称不能为空", trigger: "blur" }],
     password: [{ required: true, message: "用户密码不能为空", trigger: "blur" }, { min: 5, max: 20, message: "用户密码长度必须介于 5 和 20 之间", trigger: "blur" }],
+    roleIds: [{ required: true, message: "用户角色不能为空", trigger: "blur", }],
     email: [{ type: "email", message: "请输入正确的邮箱地址", trigger: ["blur", "change"] }],
     phonenumber: [{ pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的手机号码", trigger: "blur" }]
   }

From 53a5768676741cc8b2f5b73e170d33766c2d0f79 Mon Sep 17 00:00:00 2001
From: 1023byte <1843948009@qq.com>
Date: Tue, 18 Jul 2023 15:44:27 +0800
Subject: [PATCH 2/2] =?UTF-8?q?update=20=E8=8E=B7=E5=8F=96=E8=B4=A6?=
 =?UTF-8?q?=E5=8F=B7=E5=88=9D=E5=A7=8B=E5=AF=86=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 0ea4f4f..669896d 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -424,6 +424,12 @@ const getList = async () => {
   total.value = res.total;
 }
 
+/** 查询账号初始密码 */
+const getInitPassword = async () => {
+  const res = await proxy?.getConfigKey('sys.user.initPassword');
+  initPassword.value = res?.msg === undefined ? '123456' : res.msg;
+}
+
 /** 节点单击事件 */
 const handleNodeClick = (data: DeptVO) => {
   queryParams.value.deptId = data.id;
@@ -618,6 +624,7 @@ const resetForm = () => {
 onMounted(() => {
   getTreeSelect() // 初始化部门数据
   getList() // 初始化列表数据
+  getInitPassword() // 获取初始化密码
 });
 </script>