Merge branch 'all-v4-qindao' into 'all-v4'

fix: 是否系统租户从 userStrore 获取 设置默认值

See merge request skyeye/skyeye_frontend/skyeye-admin!221

src/store/modules/user.ts

@@ -30,6 +30,7 @@ export interface IUserState {
     remark: string;
     tenantName: string;
     tenantCode: string;
+    tenantId: number;
   };
   tenantId: number;
 }

src/utils/useTargetTenantIdSetting.ts

@@ -31,8 +31,8 @@ export function useTargetTenantIdSetting() {
     }
     return localStorage.getItem(fullKey);
   }
-
-  const isSysTenant = computed(() => getValue() !== SYS_TENANT_ID.toString())
+  const sysTenantId = getValue() || userStore.info.tenantId?.toString();
+  const isSysTenant = sysTenantId !== SYS_TENANT_ID.toString();
 
   return { setValue, getValue, isSysTenant };
 }

src/views/system/user/CreateDrawer.vue

@@ -14,7 +14,7 @@
           :disabled="!isAddUser"
         />
       </el-form-item>
-      <el-form-item label="所属部门" prop="deptId">
+      <el-form-item label="所属组织" prop="deptId">
         <el-tree-select
           v-model="formParams.deptId"
           :data="departmentList"

src/views/system/user/user.vue

@@ -78,7 +78,7 @@
             <el-space>
               <el-button v-if="scope.row.roleType !== RoleTypeEnum.SUPER_ADMIN" type="primary" :icon="Edit" text @click="handleEdit(scope.row)" />
               <el-button  v-if="scope.row.roleType !== RoleTypeEnum.SUPER_ADMIN"  type="primary" :icon="Delete" text @click="handleDelete(scope.row.id)"  />
-              <el-button type="primary" text @click="handleResetCode(scope.row.id)">重置密码</el-button>
+              <el-button type="primary" text @click="handleResetCode(scope.row)">重置密码</el-button>
             </el-space>
           </template>
         </el-table-column>