From b045cb42391de855125addc9b4d600fdb074ee09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Tue, 1 Aug 2023 11:00:41 +0800
Subject: [PATCH 1/5] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=20=E6=B3=A8?=
 =?UTF-8?q?=E5=86=8C=E9=A1=B5=E9=AA=8C=E8=AF=81=E7=A0=81=E4=B8=8D=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/register.vue | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/views/register.vue b/src/views/register.vue
index 0716532..c2dd6a3 100644
--- a/src/views/register.vue
+++ b/src/views/register.vue
@@ -132,13 +132,14 @@ const handleRegister = () => {
 }
 
 const getCode = async () => {
-  const { data } = await getCodeImg();
+  const res = await getCodeImg();
+  const { data } = res;
   captchaEnabled.value = data.captchaEnabled === undefined ? true : data.captchaEnabled;
   if (captchaEnabled.value) {
-    codeUrl.value = "data:image/gif;base64," + data.img;
+    codeUrl.value = 'data:image/gif;base64,' + data.img;
     registerForm.value.uuid = data.uuid;
   }
-}
+};
 
 const initTenantList = async () => {
   const { data } = await getTenantList();

From 3637c16d86cd20c1b6ddbe69e171c9feae6fac60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Mon, 7 Aug 2023 17:23:27 +0800
Subject: [PATCH 2/5] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E5=AD=97=E5=85=B8=E6=97=A0=E7=94=A8=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5(=E5=9F=BA=E6=9C=AC=E7=94=A8=E4=B8=8D?=
 =?UTF-8?q?=E4=B8=8A=20=E7=A6=81=E7=94=A8=E5=90=8E=E8=BF=98=E4=BC=9A?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=E5=9B=9E=E6=98=BE=E9=97=AE=E9=A2=98)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/dict/data/types.ts |  3 ---
 src/api/system/dict/type/types.ts |  3 ---
 src/views/system/dict/data.vue    | 18 ------------------
 src/views/system/dict/index.vue   | 20 +-------------------
 4 files changed, 1 insertion(+), 43 deletions(-)

diff --git a/src/api/system/dict/data/types.ts b/src/api/system/dict/data/types.ts
index a57b017..e4abb9b 100644
--- a/src/api/system/dict/data/types.ts
+++ b/src/api/system/dict/data/types.ts
@@ -1,7 +1,6 @@
 export interface DictDataQuery extends PageQuery {
   dictName: string;
   dictType: string;
-  status: string;
   dictLabel: string;
 }
 
@@ -12,7 +11,6 @@ export interface DictDataVO extends BaseEntity {
   cssClass: string;
   listClass: ElTagType;
   dictSort: number;
-  status: string;
   remark: string;
 }
 
@@ -24,6 +22,5 @@ export interface DictDataForm {
   cssClass: string;
   listClass: ElTagType;
   dictSort: number;
-  status: string;
   remark: string;
 }
diff --git a/src/api/system/dict/type/types.ts b/src/api/system/dict/type/types.ts
index 9e52ac6..4987dbf 100644
--- a/src/api/system/dict/type/types.ts
+++ b/src/api/system/dict/type/types.ts
@@ -2,7 +2,6 @@ export interface DictTypeVO extends BaseEntity {
   dictId: number | string;
   dictName: string;
   dictType: string;
-  status: string;
   remark: string;
 }
 
@@ -10,12 +9,10 @@ export interface DictTypeForm {
   dictId: number | string | undefined;
   dictName: string;
   dictType: string;
-  status: string;
   remark: string;
 }
 
 export interface DictTypeQuery extends PageQuery {
   dictName: string;
   dictType: string;
-  status: string;
 }
diff --git a/src/views/system/dict/data.vue b/src/views/system/dict/data.vue
index 117754c..4ec9d6c 100644
--- a/src/views/system/dict/data.vue
+++ b/src/views/system/dict/data.vue
@@ -12,11 +12,6 @@
             <el-form-item label="字典标签" prop="dictLabel">
               <el-input v-model="queryParams.dictLabel" placeholder="请输入字典标签" clearable style="width: 200px" @keyup.enter="handleQuery" />
             </el-form-item>
-            <el-form-item label="状态" prop="status">
-              <el-select v-model="queryParams.status" placeholder="数据状态" clearable style="width: 200px">
-                <el-option v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.label" :value="dict.value" />
-              </el-select>
-            </el-form-item>
             <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
               <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -61,11 +56,6 @@
         </el-table-column>
         <el-table-column label="字典键值" align="center" prop="dictValue" />
         <el-table-column label="字典排序" align="center" prop="dictSort" />
-        <el-table-column label="状态" align="center" prop="status">
-          <template #default="scope">
-            <dict-tag :options="sys_normal_disable" :value="scope.row.status" />
-          </template>
-        </el-table-column>
         <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
         <el-table-column label="创建时间" align="center" prop="createTime" width="180">
           <template #default="scope">
@@ -114,11 +104,6 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="状态" prop="status">
-          <el-radio-group v-model="form.status">
-            <el-radio v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.value">{{ dict.label }}</el-radio>
-          </el-radio-group>
-        </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
         </el-form-item>
@@ -141,7 +126,6 @@ import { DictTypeVO } from '@/api/system/dict/type/types';
 import { DictDataForm, DictDataQuery, DictDataVO } from "@/api/system/dict/data/types";
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance
-const { sys_normal_disable } = toRefs<any>(proxy?.useDict("sys_normal_disable"));
 const route = useRoute();
 
 const dataList = ref<DictDataVO[]>([]);
@@ -180,7 +164,6 @@ const initFormData: DictDataForm = {
   cssClass: '',
   listClass: "default",
   dictSort: 0,
-  status: "0",
   remark: ''
 }
 const data = reactive<PageData<DictDataForm, DictDataQuery>>({
@@ -190,7 +173,6 @@ const data = reactive<PageData<DictDataForm, DictDataQuery>>({
     pageSize: 10,
     dictName: '',
     dictType: '',
-    status: '',
     dictLabel: ''
   },
   rules: {
diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue
index a182c9f..f3b0051 100644
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -10,11 +10,6 @@
             <el-form-item label="字典类型" prop="dictType">
               <el-input v-model="queryParams.dictType" placeholder="请输入字典类型" clearable style="width: 240px" @keyup.enter="handleQuery" />
             </el-form-item>
-            <el-form-item label="状态" prop="status">
-              <el-select v-model="queryParams.status" placeholder="字典状态" clearable style="width: 240px">
-                <el-option v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.label" :value="dict.value" />
-              </el-select>
-            </el-form-item>
             <el-form-item label="创建时间" style="width: 308px">
               <el-date-picker
                 v-model="dateRange"
@@ -69,11 +64,6 @@
             </router-link>
           </template>
         </el-table-column>
-        <el-table-column label="状态" align="center" prop="status">
-          <template #default="scope">
-            <dict-tag :options="sys_normal_disable" :value="scope.row.status" />
-          </template>
-        </el-table-column>
         <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
         <el-table-column label="创建时间" align="center" prop="createTime" width="180">
           <template #default="scope">
@@ -103,11 +93,6 @@
         <el-form-item label="字典类型" prop="dictType">
           <el-input v-model="form.dictType" placeholder="请输入字典类型" />
         </el-form-item>
-        <el-form-item label="状态" prop="status">
-          <el-radio-group v-model="form.status">
-            <el-radio v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.value">{{ dict.label }}</el-radio>
-          </el-radio-group>
-        </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
         </el-form-item>
@@ -128,7 +113,6 @@ import { listType, getType, delType, addType, updateType, refreshCache } from "@
 import { DictTypeForm, DictTypeQuery, DictTypeVO } from "@/api/system/dict/type/types";
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { sys_normal_disable } = toRefs<any>(proxy?.useDict("sys_normal_disable"))
 
 const typeList = ref<DictTypeVO[]>([]);
 const loading = ref(true);
@@ -152,7 +136,6 @@ const initFormData: DictTypeForm = {
   dictId: undefined,
   dictName: '',
   dictType: '',
-  status: "0",
   remark: ''
 }
 const data = reactive<PageData<DictTypeForm, DictTypeQuery>>({
@@ -161,8 +144,7 @@ const data = reactive<PageData<DictTypeForm, DictTypeQuery>>({
     pageNum: 1,
     pageSize: 10,
     dictName: '',
-    dictType: '',
-    status: ''
+    dictType: ''
   },
   rules: {
     dictName: [{ required: true, message: "字典名称不能为空", trigger: "blur" }],

From 7e54fe792157e074b306d32a4867a7591271592d Mon Sep 17 00:00:00 2001
From: Lionel <12719401+wisdom_woods@user.noreply.gitee.com>
Date: Tue, 8 Aug 2023 11:43:11 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E5=B0=86=E9=83=A8=E9=97=A8=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=20=E8=B4=9F=E8=B4=A3=E4=BA=BA=E9=80=89=E9=A1=B9?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E4=B8=8B=E6=8B=89=E6=A1=86=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=20=E4=BB=8E=E5=BD=93=E5=89=8D=E9=83=A8=E9=97=A8=E7=9A=84?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=88=97=E8=A1=A8=E9=80=89=E6=8B=A9=E4=B8=80?=
 =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E5=81=9A=E7=BB=91=E5=AE=9A=20=E5=90=8E?=
 =?UTF-8?q?=E7=AB=AF=E6=8E=A5=E6=94=B6=E7=94=A8=E6=88=B7ID?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/user/index.ts    | 14 +++++++++++++-
 src/views/system/dept/index.vue | 21 ++++++++++++++++++---
 2 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/src/api/system/user/index.ts b/src/api/system/user/index.ts
index 21325c3..fc516e9 100644
--- a/src/api/system/user/index.ts
+++ b/src/api/system/user/index.ts
@@ -169,6 +169,17 @@ export const updateAuthRole = (data: { userId: string; roleIds: string }) => {
   });
 };
 
+/**
+ * 查询当前部门的所有用户信息
+ * @param deptId
+ */
+export const listUserByDeptId = (deptId: string | number): AxiosPromise<DeptVO[]> => {
+  return request({
+    url: "/system/user/list/dept/" + deptId,
+    method: "get"
+  });
+};
+
 /**
  * 查询部门下拉树结构
  */
@@ -193,5 +204,6 @@ export default {
   uploadAvatar,
   getAuthRole,
   updateAuthRole,
-  deptTreeSelect
+  deptTreeSelect,
+  listUserByDeptId
 };
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index 12f7564..75f2843 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -97,7 +97,9 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="负责人" prop="leader">
-              <el-input v-model="form.leader" placeholder="请输入负责人" maxlength="20" />
+              <el-select v-model="form.leader" placeholder="请选择负责人">
+                <el-option v-for="item in deptUserList" :key="item.userId" :label="item.userName" :value="item.userId" />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -114,7 +116,7 @@
             <el-form-item label="部门状态">
               <el-radio-group v-model="form.status">
                 <el-radio v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.value">{{ dict.label
-                }}</el-radio>
+                  }}</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
@@ -133,6 +135,8 @@
 <script setup name="Dept" lang="ts">
 import { listDept, getDept, delDept, addDept, updateDept, listDeptExcludeChild } from "@/api/system/dept"
 import { DeptForm, DeptQuery, DeptVO } from "@/api/system/dept/types";
+import {UserVO} from "@/api/system/user/types";
+import {listUserByDeptId} from "@/api/system/user";
 
 interface DeptOptionsType {
   deptId: number | string;
@@ -149,7 +153,7 @@ const loading = ref(true)
 const showSearch = ref(true)
 const deptOptions = ref<DeptOptionsType[]>([])
 const isExpandAll = ref(true)
-
+const deptUserList = ref<UserVO[]>([]);
 
 const dialog = reactive<DialogOption>({
   visible: false,
@@ -199,6 +203,15 @@ const getList = async () => {
   }
   loading.value = false
 }
+
+/** 查询当前部门的所有用户 */
+async function getDeptAllUser(deptId: any) {
+  if (deptId !== null && deptId !== "" && deptId !== undefined) {
+    const res = await listUserByDeptId(deptId);
+    deptUserList.value = res.data;
+  }
+}
+
 /** 取消按钮 */
 const cancel = () => {
   reset()
@@ -251,6 +264,8 @@ const handleAdd = async (row?: DeptVO) => {
 /** 修改按钮操作 */
 const handleUpdate = async (row: DeptVO) => {
   reset();
+  //查询当前部门所有用户
+  getDeptAllUser(row.deptId);
   const res = await getDept(row.deptId);
   form.value = res.data
   const response = await listDeptExcludeChild(row.deptId);

From 50891e99ac572897ed66090b0237885013bd8cd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Wed, 9 Aug 2023 12:59:18 +0800
Subject: [PATCH 4/5] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=20=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E8=8E=B7=E5=8F=96token=E9=97=AE=E9=A2=98=20=E5=B0=86?=
 =?UTF-8?q?=20globalHeaders=20=E6=94=B9=E4=B8=BA=E5=87=BD=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Editor/index.vue      | 2 +-
 src/components/FileUpload/index.vue  | 2 +-
 src/components/ImageUpload/index.vue | 2 +-
 src/plugins/download.ts              | 4 ++--
 src/utils/request.ts                 | 8 +++++---
 src/views/system/user/index.vue      | 2 +-
 6 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/components/Editor/index.vue b/src/components/Editor/index.vue
index 9c61f3b..6aef16b 100644
--- a/src/components/Editor/index.vue
+++ b/src/components/Editor/index.vue
@@ -50,7 +50,7 @@ const props = defineProps({
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
 const upload = reactive<UploadOption>({
-  headers: globalHeaders,
+  headers: globalHeaders(),
   url: import.meta.env.VITE_APP_BASE_API + '/resource/oss/upload'
 })
 const myQuillEditor = ref();
diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue
index 260f43c..be99ac0 100644
--- a/src/components/FileUpload/index.vue
+++ b/src/components/FileUpload/index.vue
@@ -66,7 +66,7 @@ const uploadList = ref<any[]>([]);
 
 const baseUrl = import.meta.env.VITE_APP_BASE_API;
 const uploadFileUrl = ref(baseUrl + "/resource/oss/upload"); // 上传文件服务器地址
-const headers = ref(globalHeaders);
+const headers = ref(globalHeaders());
 
 const fileList = ref<any[]>([]);
 const showTip = computed(
diff --git a/src/components/ImageUpload/index.vue b/src/components/ImageUpload/index.vue
index 0c1e640..d8ed32b 100644
--- a/src/components/ImageUpload/index.vue
+++ b/src/components/ImageUpload/index.vue
@@ -70,7 +70,7 @@ const dialogVisible = ref(false);
 
 const baseUrl = import.meta.env.VITE_APP_BASE_API;
 const uploadImgUrl = ref(baseUrl + "/resource/oss/upload"); // 上传的图片服务器地址
-const headers = ref(globalHeaders);
+const headers = ref(globalHeaders());
 
 const fileList = ref<any[]>([]);
 const showTip = computed(
diff --git a/src/plugins/download.ts b/src/plugins/download.ts
index b661457..25f0e35 100644
--- a/src/plugins/download.ts
+++ b/src/plugins/download.ts
@@ -16,7 +16,7 @@ export default {
         method: 'get',
         url: url,
         responseType: 'blob',
-        headers: globalHeaders,
+        headers: globalHeaders(),
       });
       const isBlob = blobValidate(res.data);
       if (isBlob) {
@@ -40,7 +40,7 @@ export default {
         method: 'get',
         url: url,
         responseType: 'blob',
-        headers: globalHeaders,
+        headers: globalHeaders(),
       });
       const isBlob = blobValidate(res.data);
       if (isBlob) {
diff --git a/src/utils/request.ts b/src/utils/request.ts
index 5b8480b..4ade2f4 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -14,9 +14,11 @@ import { encrypt } from '@/utils/jsencrypt';
 let downloadLoadingInstance: LoadingInstance;
 // 是否显示重新登录
 export const isRelogin = { show: false };
-export const globalHeaders = {
-  Authorization: "Bearer " + getToken(),
-  clientid: import.meta.env.VITE_APP_CLIENT_ID
+export const globalHeaders = () => {
+  return {
+    Authorization: "Bearer " + getToken(),
+    clientid: import.meta.env.VITE_APP_CLIENT_ID
+  }
 }
 
 axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8';
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 3da644d..9d2fcdd 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -335,7 +335,7 @@ const upload = reactive<ImportOption>({
   // 是否更新已经存在的用户数据
   updateSupport: 0,
   // 设置上传的请求头部
-  headers: globalHeaders,
+  headers: globalHeaders(),
   // 上传的地址
   url: import.meta.env.VITE_APP_BASE_API + "/system/user/importData"
 })

From b221ff25660b593ff2b1d1ac4ab9dfe1d46ed955 Mon Sep 17 00:00:00 2001
From: lishanming <vision.lsm.2012@gmail.com>
Date: Wed, 9 Aug 2023 15:15:10 +0800
Subject: [PATCH 5/5] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=E7=BC=96=E8=AF=91?=
 =?UTF-8?q?=E6=8A=A5=E7=B1=BB=E5=9E=8B=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/user/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/api/system/user/index.ts b/src/api/system/user/index.ts
index fc516e9..f00a0e3 100644
--- a/src/api/system/user/index.ts
+++ b/src/api/system/user/index.ts
@@ -173,7 +173,7 @@ export const updateAuthRole = (data: { userId: string; roleIds: string }) => {
  * 查询当前部门的所有用户信息
  * @param deptId
  */
-export const listUserByDeptId = (deptId: string | number): AxiosPromise<DeptVO[]> => {
+export const listUserByDeptId = (deptId: string | number): AxiosPromise<UserVO[]> => {
   return request({
     url: "/system/user/list/dept/" + deptId,
     method: "get"