From 191527f0aa0314a63119a4e862924767314a98fc Mon Sep 17 00:00:00 2001
From: zhc077 <565291854@qq.com>
Date: Fri, 8 Nov 2024 11:58:29 +0800
Subject: [PATCH 1/4] =?UTF-8?q?logo=E3=80=81=E5=85=B3=E9=94=AE=E5=AD=97?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=BF=AE=E6=94=B9=2011.7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/controller/SysUserController.java  |   2 +-
 .../assets/loginmini/icon/jeecg_ad_text2.png  | Bin 14561 -> 13679 bytes
 .../assets/loginmini/icon/jeecg_ad_text4.png  | Bin 0 -> 15612 bytes
 .../assets/loginmini/icon/jeecg_ad_text5.png  | Bin 0 -> 26339 bytes
 .../header/components/user-dropdown/index.vue |   2 +-
 .../src/views/system/loginmini/MiniLogin.vue  |   2 +-
 6 files changed, 3 insertions(+), 3 deletions(-)
 create mode 100644 jeecgboot-vue3/src/assets/loginmini/icon/jeecg_ad_text4.png
 create mode 100644 jeecgboot-vue3/src/assets/loginmini/icon/jeecg_ad_text5.png

diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
index a598dd7..6daa6a2 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
@@ -1759,7 +1759,7 @@ public class SysUserController {
      * @return
      */
     @PostMapping("/login/setting/userEdit")
-    @RequiresPermissions("system:user:setting:edit")
+//    @RequiresPermissions("system:user:setting:edit")
     public Result<String> userEdit(@RequestBody SysUser sysUser, HttpServletRequest request) {
         String username = JwtUtil.getUserNameByToken(request);
         SysUser user = sysUserService.getById(sysUser.getId());
diff --git a/jeecgboot-vue3/src/assets/loginmini/icon/jeecg_ad_text2.png b/jeecgboot-vue3/src/assets/loginmini/icon/jeecg_ad_text2.png
index 6db45906eaa16b09557b9870f6ed0a089b6c42fe..b7c5b0471d11ee9483e6118bc425bee8ba6fb44e 100644
GIT binary patch
delta 11661
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

literal 14561
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
DfaJ^5

diff --git a/jeecgboot-vue3/src/assets/loginmini/icon/jeecg_ad_text4.png b/jeecgboot-vue3/src/assets/loginmini/icon/jeecg_ad_text4.png
new file mode 100644
index 0000000000000000000000000000000000000000..fb29e6a8b359f7cee7b846903b710c2be972b238
GIT binary patch
literal 15612
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

literal 0
HcmV?d00001

diff --git a/jeecgboot-vue3/src/assets/loginmini/icon/jeecg_ad_text5.png b/jeecgboot-vue3/src/assets/loginmini/icon/jeecg_ad_text5.png
new file mode 100644
index 0000000000000000000000000000000000000000..b39bf66d2af087705a0bc1806eea8357b393a5a4
GIT binary patch
literal 26339
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%0D|NRRZDSd}H<(ddmvvz(yV$j?YJ1hs@Ve
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

literal 0
HcmV?d00001

diff --git a/jeecgboot-vue3/src/layouts/default/header/components/user-dropdown/index.vue b/jeecgboot-vue3/src/layouts/default/header/components/user-dropdown/index.vue
index 7794649..5d0feeb 100644
--- a/jeecgboot-vue3/src/layouts/default/header/components/user-dropdown/index.vue
+++ b/jeecgboot-vue3/src/layouts/default/header/components/user-dropdown/index.vue
@@ -13,7 +13,7 @@
       <Menu @click="handleMenuClick">
         <MenuItem itemKey="doc" :text="t('layout.header.dropdownItemDoc')" icon="ion:document-text-outline" v-if="getShowDoc" />
         <MenuDivider v-if="getShowDoc" />
-        <MenuItem itemKey="account" :text="t('layout.header.dropdownItemSwitchAccount')" icon="ant-design:setting-outlined" />
+<!--        <MenuItem itemKey="account" :text="t('layout.header.dropdownItemSwitchAccount')" icon="ant-design:setting-outlined" />-->
         <MenuItem itemKey="password" :text="t('layout.header.dropdownItemSwitchPassword')" icon="ant-design:edit-outlined" />
 <!--        <MenuItem itemKey="depart" :text="t('layout.header.dropdownItemSwitchDepart')" icon="ant-design:cluster-outlined" />-->
         <MenuItem itemKey="cache" :text="t('layout.header.dropdownItemRefreshCache')" icon="ion:sync-outline" />
diff --git a/jeecgboot-vue3/src/views/system/loginmini/MiniLogin.vue b/jeecgboot-vue3/src/views/system/loginmini/MiniLogin.vue
index c98c1fa..b29caed 100644
--- a/jeecgboot-vue3/src/views/system/loginmini/MiniLogin.vue
+++ b/jeecgboot-vue3/src/views/system/loginmini/MiniLogin.vue
@@ -177,7 +177,7 @@
   import MiniForgotpad from './MiniForgotpad.vue';
   import MiniRegister from './MiniRegister.vue';
   import MiniCodelogin from './MiniCodelogin.vue';
-  import logoImg from '/@/assets/loginmini/icon/jeecg_ad_text3.png';
+  import logoImg from '/@/assets/loginmini/icon/jeecg_ad_text2.png';
   // import adTextImg from '/@/assets/loginmini/icon/jeecg_ad_text.png';
   import { AppLocalePicker, AppDarkModeToggle } from '/@/components/Application';
   import { useLocaleStore } from '/@/store/modules/locale';

From 103dd9a0862dd3782f134062a127efee149dd752 Mon Sep 17 00:00:00 2001
From: zhc077 <565291854@qq.com>
Date: Fri, 8 Nov 2024 15:30:15 +0800
Subject: [PATCH 2/4] =?UTF-8?q?logo=E3=80=81=E5=85=B3=E9=94=AE=E5=AD=97?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=BF=AE=E6=94=B9=2011.8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/controller/SysUserController.java  |  20 +
 .../src/views/declarant/user.data.ts          |   5 +-
 .../views/system/kejijuuser/PasswordModal.vue |  42 ++
 .../system/kejijuuser/UserAgentModal.vue      |  45 ++
 .../views/system/kejijuuser/UserDrawer.vue    | 178 ++++++
 .../system/kejijuuser/UserQuitAgentModal.vue  |  81 +++
 .../views/system/kejijuuser/UserQuitModal.vue | 110 ++++
 .../system/kejijuuser/UserRecycleBinModal.vue | 166 +++++
 .../src/views/system/kejijuuser/index.vue     | 301 +++++++++
 .../src/views/system/kejijuuser/user.api.ts   | 254 ++++++++
 .../src/views/system/kejijuuser/user.data.ts  | 569 ++++++++++++++++++
 .../views/system/kejijuuser/userDetails.vue   |  54 ++
 12 files changed, 1823 insertions(+), 2 deletions(-)
 create mode 100644 jeecgboot-vue3/src/views/system/kejijuuser/PasswordModal.vue
 create mode 100644 jeecgboot-vue3/src/views/system/kejijuuser/UserAgentModal.vue
 create mode 100644 jeecgboot-vue3/src/views/system/kejijuuser/UserDrawer.vue
 create mode 100644 jeecgboot-vue3/src/views/system/kejijuuser/UserQuitAgentModal.vue
 create mode 100644 jeecgboot-vue3/src/views/system/kejijuuser/UserQuitModal.vue
 create mode 100644 jeecgboot-vue3/src/views/system/kejijuuser/UserRecycleBinModal.vue
 create mode 100644 jeecgboot-vue3/src/views/system/kejijuuser/index.vue
 create mode 100644 jeecgboot-vue3/src/views/system/kejijuuser/user.api.ts
 create mode 100644 jeecgboot-vue3/src/views/system/kejijuuser/user.data.ts
 create mode 100644 jeecgboot-vue3/src/views/system/kejijuuser/userDetails.vue

diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
index 6daa6a2..1ac5577 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
@@ -163,6 +163,26 @@ public class SysUserController {
         return sysUserService.queryPageList(req, queryWrapper, pageSize, pageNo);
     }
 
+    /**
+     * @description: 根据用户角色查询下属用户
+     * @param: [user, pageNo, pageSize, req]
+     * @return: org.jeecg.common.api.vo.Result<com.baomidou.mybatisplus.core.metadata.IPage<org.jeecg.modules.system.entity.SysUser>>
+     * @author: z.h.c
+     * @date: 24/11/8 15:19
+     */
+//    @RequiresPermissions("system:user:listAll")
+    @RequestMapping(value = "/listByRollCode", method = RequestMethod.GET)
+    public Result<IPage<SysUser>> listByRollCode(SysUser user, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                   @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
+
+        QueryWrapper<SysUser> queryWrapper = QueryGenerator.initQueryWrapper(user, req.getParameterMap());
+        LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+//        SysDepart sysDepart = sysDepartService.getById(loginUser.getOrgId());
+
+        queryWrapper.likeRight("org_code", loginUser.getOrgCode());
+        return sysUserService.queryPageList(req, queryWrapper, pageSize, pageNo);
+    }
+
     /**
      * @description: 根据用户权限查询申报人列表
      * @param: [user, pageNo, pageSize, req]
diff --git a/jeecgboot-vue3/src/views/declarant/user.data.ts b/jeecgboot-vue3/src/views/declarant/user.data.ts
index ede01ad..3a80a8b 100644
--- a/jeecgboot-vue3/src/views/declarant/user.data.ts
+++ b/jeecgboot-vue3/src/views/declarant/user.data.ts
@@ -40,7 +40,7 @@ export const columns: BasicColumn[] = [
     width: 100,
   },
   {
-    title: '部门',
+    title: '单位',
     width: 150,
     dataIndex: 'orgCodeTxt',
   },
@@ -51,7 +51,8 @@ export const columns: BasicColumn[] = [
   // },
   {
     title: '状态',
-    dataIndex: 'orgCategory_dictText',
+    // dataIndex: 'orgCategory_dictText',
+    dataIndex: 'status_dictText',
     width: 80,
   },
 ];
diff --git a/jeecgboot-vue3/src/views/system/kejijuuser/PasswordModal.vue b/jeecgboot-vue3/src/views/system/kejijuuser/PasswordModal.vue
new file mode 100644
index 0000000..d638c86
--- /dev/null
+++ b/jeecgboot-vue3/src/views/system/kejijuuser/PasswordModal.vue
@@ -0,0 +1,42 @@
+<template>
+  <BasicModal v-bind="$attrs" @register="registerModal" title="修改密码" @ok="handleSubmit">
+    <BasicForm @register="registerForm" />
+  </BasicModal>
+</template>
+<script lang="ts" name="PassWordModal" setup>
+  import { ref, computed, unref } from 'vue';
+  import { BasicModal, useModalInner } from '/@/components/Modal';
+  import { BasicForm, useForm } from '/@/components/Form/index';
+  import { formPasswordSchema } from './user.data';
+  import { changePassword } from './user.api';
+  // 声明Emits
+  const emit = defineEmits(['success', 'register']);
+  //表单配置
+  const [registerForm, { resetFields, setFieldsValue, validate }] = useForm({
+    schemas: formPasswordSchema,
+    showActionButtonGroup: false,
+  });
+  //表单赋值
+  const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
+    //重置表单
+    await resetFields();
+    setModalProps({ confirmLoading: false });
+    //表单赋值
+    await setFieldsValue({ ...data });
+  });
+  //表单提交事件
+  async function handleSubmit() {
+    try {
+      const values = await validate();
+      setModalProps({ confirmLoading: true });
+      //提交表单
+      await changePassword(values);
+      //关闭弹窗
+      closeModal();
+      //刷新列表
+      emit('success');
+    } finally {
+      setModalProps({ confirmLoading: false });
+    }
+  }
+</script>
diff --git a/jeecgboot-vue3/src/views/system/kejijuuser/UserAgentModal.vue b/jeecgboot-vue3/src/views/system/kejijuuser/UserAgentModal.vue
new file mode 100644
index 0000000..4f3c50d
--- /dev/null
+++ b/jeecgboot-vue3/src/views/system/kejijuuser/UserAgentModal.vue
@@ -0,0 +1,45 @@
+<template>
+  <BasicModal v-bind="$attrs" @register="registerModal" :width="800" title="用户代理" @ok="handleSubmit" destroyOnClose>
+    <BasicForm @register="registerForm" />
+  </BasicModal>
+</template>
+<script lang="ts" setup>
+  import { ref, computed, unref } from 'vue';
+  import { BasicModal, useModalInner } from '/@/components/Modal';
+  import { BasicForm, useForm } from '/@/components/Form/index';
+  import { formAgentSchema } from './user.data';
+  import { getUserAgent, saveOrUpdateAgent } from './user.api';
+  // 声明Emits
+  const emit = defineEmits(['success', 'register']);
+  //表单配置
+  const [registerForm, { resetFields, setFieldsValue, validate }] = useForm({
+    schemas: formAgentSchema,
+    showActionButtonGroup: false,
+  });
+  //表单赋值
+  const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
+    //重置表单
+    await resetFields();
+    setModalProps({ confirmLoading: false });
+    //查询获取表单数据
+    const res = await getUserAgent({ userName: data.userName });
+    data = res.result ? res.result : data;
+    //表单赋值
+    await setFieldsValue({ ...data });
+  });
+  //表单提交事件
+  async function handleSubmit() {
+    try {
+      const values = await validate();
+      setModalProps({ confirmLoading: true });
+      //提交表单
+      await saveOrUpdateAgent(values);
+      //关闭弹窗
+      closeModal();
+      //刷新列表
+      emit('success');
+    } finally {
+      setModalProps({ confirmLoading: false });
+    }
+  }
+</script>
diff --git a/jeecgboot-vue3/src/views/system/kejijuuser/UserDrawer.vue b/jeecgboot-vue3/src/views/system/kejijuuser/UserDrawer.vue
new file mode 100644
index 0000000..a4aa708
--- /dev/null
+++ b/jeecgboot-vue3/src/views/system/kejijuuser/UserDrawer.vue
@@ -0,0 +1,178 @@
+<template>
+  <BasicDrawer
+    v-bind="$attrs"
+    @register="registerDrawer"
+    :title="getTitle"
+    :width="adaptiveWidth"
+    @ok="handleSubmit"
+    :showFooter="showFooter"
+    destroyOnClose
+  >
+    <BasicForm @register="registerForm" />
+  </BasicDrawer>
+</template>
+<script lang="ts" setup>
+  import { defineComponent, ref, computed, unref, useAttrs } from 'vue';
+  import { BasicForm, useForm } from '/@/components/Form/index';
+  import { formSchema } from './user.data';
+  import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
+  import { saveOrUpdateUser, getUserRoles, getUserDepartList, getAllRolesListNoByTenant, getAllRolesList } from './user.api';
+  import { useDrawerAdaptiveWidth } from '/@/hooks/jeecg/useAdaptiveWidth';
+  import { getTenantId } from "/@/utils/auth";
+
+  // 声明Emits
+  const emit = defineEmits(['success', 'register']);
+  const attrs = useAttrs();
+  const isUpdate = ref(true);
+  const rowId = ref('');
+  const departOptions = ref([]);
+  let isFormDepartUser = false;
+  //表单配置
+  const [registerForm, { setProps, resetFields, setFieldsValue, validate, updateSchema }] = useForm({
+    labelWidth: 90,
+    schemas: formSchema,
+    showActionButtonGroup: false,
+  });
+  // TODO [VUEN-527] https://www.teambition.com/task/6239beb894b358003fe93626
+  const showFooter = ref(true);
+  //表单赋值
+  const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
+    await resetFields();
+    showFooter.value = data?.showFooter ?? true;
+    setDrawerProps({ confirmLoading: false, showFooter: showFooter.value });
+    isUpdate.value = !!data?.isUpdate;
+    if (unref(isUpdate)) {
+      rowId.value = data.record.id;
+      //租户信息定义成数组
+      if (data.record.relTenantIds && !Array.isArray(data.record.relTenantIds)) {
+        data.record.relTenantIds = data.record.relTenantIds.split(',');
+      } else {
+        //【issues/I56C5I】用户管理中连续点两次编辑租户配置就丢失了
+        //data.record.relTenantIds = [];
+      }
+
+      //查角色/赋值/try catch 处理，不然编辑有问题
+      try {
+        const userRoles = await getUserRoles({ userid: data.record.id });
+        if (userRoles && userRoles.length > 0) {
+          data.record.selectedroles = userRoles;
+        }
+      } catch (error) {}
+
+      //查所属部门/赋值
+      const userDepart = await getUserDepartList({ userId: data.record.id });
+      if (userDepart && userDepart.length > 0) {
+        data.record.selecteddeparts = userDepart;
+        let selectDepartKeys = Array.from(userDepart, ({ key }) => key);
+        data.record.selecteddeparts = selectDepartKeys.join(',');
+        departOptions.value = userDepart.map((item) => {
+          return { label: item.title, value: item.key };
+        });
+      }
+      //负责部门/赋值
+      data.record.departIds && !Array.isArray(data.record.departIds) && (data.record.departIds = data.record.departIds.split(','));
+      //update-begin---author:zyf   Date:20211210  for：避免空值显示异常------------
+      //update-begin---author:liusq   Date:20231008  for：[issues/772]避免空值显示异常------------
+      data.record.departIds =  (!data.record.departIds || data.record.departIds == '') ? [] : data.record.departIds;
+      //update-end-----author:liusq   Date:20231008  for：[issues/772]避免空值显示异常------------
+      //update-begin---author:zyf   Date:20211210  for：避免空值显示异常------------
+    }
+    //处理角色用户列表情况(和角色列表有关系)
+    data.selectedroles && (await setFieldsValue({ selectedroles: data.selectedroles }));
+    // -update-begin--author:liaozhiyang---date:20240702---for：【TV360X-1737】部门用户编辑接口，增加参数updateFromPage:"deptUsers"
+    isFormDepartUser = data?.departDisabled === true ? true : false;
+    // -update-end--author:liaozhiyang---date:20240702---for：【TV360X-1737】部门用户编辑接口，增加参数updateFromPage:"deptUsers"
+    //编辑时隐藏密码/角色列表隐藏角色信息/我的部门时隐藏所属部门
+    updateSchema([
+      {
+        field: 'password',
+        // 【QQYUN-8324】
+        ifShow: !unref(isUpdate),
+      },
+      {
+        field: 'confirmPassword',
+        ifShow: !unref(isUpdate),
+      },
+      {
+        field: 'selectedroles',
+        show: !data.isRole,
+      },
+      {
+        field: 'departIds',
+        componentProps: { options: departOptions },
+      },
+      {
+        field: 'selecteddeparts',
+        show: !data?.departDisabled,
+      },
+      {
+        field: 'selectedroles',
+        show: !data?.departDisabled,
+        //update-begin---author:wangshuai ---date:20230424  for：【issues/4844】多租户模式下，新增或编辑用户，选择角色一栏，角色选项没有做租户隔离------------
+        //判断是否为多租户模式
+        componentProps:{
+          api: data.tenantSaas?getAllRolesList:getAllRolesListNoByTenant
+        }
+        //update-end---author:wangshuai ---date:20230424  for：【issues/4844】多租户模式下，新增或编辑用户，选择角色一栏，角色选项没有做租户隔离------------
+      },
+      //update-begin---author:wangshuai ---date:20230522  for：【issues/4935】租户用户编辑界面中租户下拉框未过滤，显示当前系统所有的租户------------
+      {
+        field: 'relTenantIds',
+        componentProps:{
+          disabled: !!data.tenantSaas,
+        },
+      },
+      //update-end---author:wangshuai ---date:20230522  for：【issues/4935】租户用户编辑界面中租户下拉框未过滤，显示当前系统所有的租户------------
+    ]);
+    //update-begin---author:wangshuai ---date:20230522  for：【issues/4935】租户用户编辑界面中租户下拉框未过滤，显示当前系统所有的租户------------
+    if(!unref(isUpdate) && data.tenantSaas){
+      await setFieldsValue({ relTenantIds: getTenantId().toString() })
+    }
+    //update-end---author:wangshuai ---date:20230522  for：【issues/4935】租户用户编辑界面中租户下拉框未过滤，显示当前系统所有的租户------------
+    // 无论新增还是编辑，都可以设置表单值
+    if (typeof data.record === 'object') {
+      setFieldsValue({
+        ...data.record,
+      });
+    }
+    // 隐藏底部时禁用整个表单
+    //update-begin-author:taoyan date:2022-5-24 for: VUEN-1117【issue】0523周开源问题
+    setProps({ disabled: !showFooter.value });
+    //update-end-author:taoyan date:2022-5-24 for: VUEN-1117【issue】0523周开源问题
+  });
+  //获取标题
+  const getTitle = computed(() => {
+    // update-begin--author:liaozhiyang---date:20240306---for：【QQYUN-8389】系统用户详情抽屉title更改
+    if (!unref(isUpdate)) {
+      return '新增用户';
+    } else {
+      return unref(showFooter) ? '编辑用户' : '用户详情';
+    }
+    // update-end--author:liaozhiyang---date:20240306---for：【QQYUN-8389】系统用户详情抽屉title更改
+  });
+  const { adaptiveWidth } = useDrawerAdaptiveWidth();
+
+  //提交事件
+  async function handleSubmit() {
+    try {
+      let values = await validate();
+      setDrawerProps({ confirmLoading: true });
+      values.userIdentity === 1 && (values.departIds = '');
+      let isUpdateVal = unref(isUpdate);
+      // -update-begin--author:liaozhiyang---date:20240702---for：【TV360X-1737】部门用户编辑接口，增加参数updateFromPage:"deptUsers"
+      let params = values;
+      if (isFormDepartUser) {
+        params = { ...params, updateFromPage: 'deptUsers' };
+      }
+      // -update-end--author:liaozhiyang---date:20240702---for：【TV360X-1737】部门用户编辑接口，增加参数updateFromPage:"deptUsers"
+      //提交表单
+      await saveOrUpdateUser(params, isUpdateVal);
+      //关闭弹窗
+      closeDrawer();
+      //刷新列表
+      emit('success',{isUpdateVal ,values});
+    } finally {
+      setDrawerProps({ confirmLoading: false });
+    }
+  }
+</script>
diff --git a/jeecgboot-vue3/src/views/system/kejijuuser/UserQuitAgentModal.vue b/jeecgboot-vue3/src/views/system/kejijuuser/UserQuitAgentModal.vue
new file mode 100644
index 0000000..a1bc4d3
--- /dev/null
+++ b/jeecgboot-vue3/src/views/system/kejijuuser/UserQuitAgentModal.vue
@@ -0,0 +1,81 @@
+<template>
+  <BasicModal v-bind="$attrs" @register="registerModal" :width="800" title="离职交接" @ok="handleSubmit">
+    <BasicForm @register="registerForm" />
+  </BasicModal>
+</template>
+<script lang="ts" setup name="user-quit-agent-modal">
+  import { BasicModal, useModalInner } from '/@/components/Modal';
+  import { BasicForm, useForm } from '/@/components/Form/index';
+  import { formQuitAgentSchema } from './user.data';
+  import { getUserAgent, userQuitAgent } from './user.api';
+  import dayjs from 'dayjs';
+  // 声明Emits
+  const emit = defineEmits(['success', 'register']);
+  //表单配置
+  const [registerForm, { resetFields, setFieldsValue, validate, clearValidate, updateSchema }] = useForm({
+    schemas: formQuitAgentSchema,
+    showActionButtonGroup: false,
+  });
+  //表单赋值
+  const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
+    //重置表单
+    await resetFields();
+    setModalProps({ confirmLoading: true });
+    
+    let userId = data.userId;
+    //查询获取表单数据
+    const res = await getUserAgent({ userName: data.userName });
+    data = res.result ? res.result : data;
+    let date = new Date();
+    if (!data.startTime) {
+      data.startTime = dayjs(date).format('YYYY-MM-DD HH:mm:ss');
+    }
+    if (!data.endTime) {
+      data.endTime = getYear(date);
+    }
+
+    //update-begin---author:wangshuai ---date:20230703  for：【QQYUN-5685】5、离职人员可以选自己------------
+    await updateSchema(
+      [{
+        field:'agentUserName',
+        componentProps:{
+          excludeUserIdList:[userId]
+        }
+      }]
+    )
+    //update-end---author:wangshuai ---date:20230703  for：【QQYUN-5685】5、离职人员可以选自己------------
+    //表单赋值
+    await setFieldsValue({ ...data });
+    setModalProps({ confirmLoading: false });
+  });
+  //表单提交事件
+  async function handleSubmit() {
+    try {
+      const values = await validate();
+      setModalProps({ confirmLoading: true });
+      //提交表单
+      await userQuitAgent(values);
+      //关闭弹窗
+      closeModal();
+      //刷新列表
+      emit('success',values.userName);
+    } finally {
+      setModalProps({ confirmLoading: false });
+    }
+  }
+
+  /**
+   * 获取后30年
+   */
+  function getYear(date) {
+    //update-begin---author:wangshuai ---date:20221207  for：[QQYUN-3285]交接人设置 结束时间有问题------------
+    //这是一个数值
+    let y = date.getFullYear() + 30;
+    let m = dayjs(date).format('MM');
+    let d = dayjs(date).format('DD');
+    let hour = dayjs(date).format('HH:mm:ss');
+    console.log('年月日', y + '-' + m + '-' + d);
+    return dayjs(y + '-' + m + '-' + d + ' ' + hour).format('YYYY-MM-DD HH:mm:ss');
+    //update-end---author:wangshuai ---date:20221207  for：[QQYUN-3285]交接人设置 结束时间有问题--------------
+  }
+</script>
diff --git a/jeecgboot-vue3/src/views/system/kejijuuser/UserQuitModal.vue b/jeecgboot-vue3/src/views/system/kejijuuser/UserQuitModal.vue
new file mode 100644
index 0000000..7822269
--- /dev/null
+++ b/jeecgboot-vue3/src/views/system/kejijuuser/UserQuitModal.vue
@@ -0,0 +1,110 @@
+<template>
+  <BasicModal v-bind="$attrs" @register="registerModal" title="离职人员信息" :showOkBtn="false" width="1000px" destroyOnClose>
+    <BasicTable @register="registerTable" :rowSelection="rowSelection">
+      <!--插槽:table标题-->
+      <template #tableTitle>
+        <a-dropdown v-if="selectedRowKeys.length > 0">
+          <template #overlay>
+            <a-menu>
+              <a-menu-item key="1" @click="batchHandleRevert">
+                <Icon icon="ant-design:redo-outlined"></Icon>
+                批量取消
+              </a-menu-item>
+            </a-menu>
+          </template>
+          <a-button
+            >批量操作
+            <Icon icon="ant-design:down-outlined"></Icon>
+          </a-button>
+        </a-dropdown>
+      </template>
+      <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" />
+      </template>
+    </BasicTable>
+  </BasicModal>
+</template>
+
+<script lang="ts" setup name="user-quit-modal">
+  import { ref, toRaw, unref } from 'vue';
+  import { BasicModal, useModalInner } from '/@/components/Modal';
+  import { BasicTable, useTable, TableAction } from '/@/components/Table';
+  import { recycleColumns } from './user.data';
+  import { getQuitList, putCancelQuit, deleteRecycleBin } from './user.api';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import { useListPage } from '/@/hooks/system/useListPage';
+  import { Modal } from 'ant-design-vue';
+  import { defHttp } from '/@/utils/http/axios';
+
+  const { createConfirm } = useMessage();
+  // 声明Emits
+  const emit = defineEmits(['success', 'register']);
+  const checkedKeys = ref<Array<string | number>>([]);
+  const [registerModal] = useModalInner(() => {
+    checkedKeys.value = [];
+  });
+  //注册table数据
+  const { prefixCls, tableContext } = useListPage({
+    tableProps: {
+      api: getQuitList,
+      columns: recycleColumns,
+      rowKey: 'id',
+      canResize: false,
+      useSearchForm: false,
+      actionColumn: {
+        width: 120,
+      },
+    },
+  });
+  //注册table数据
+  const [registerTable, { reload }, { rowSelection, selectedRowKeys, selectedRows }] = tableContext;
+
+  /**
+   * 取消离职事件
+   * @param record
+   */
+  async function handleCancelQuit(record) {
+    await putCancelQuit({ userIds: record.id, usernames: record.username }, reload);
+    emit('success');
+  }
+  /**
+   * 批量取消离职事件
+   */
+  function batchHandleRevert() {
+    Modal.confirm({
+      title: '取消离职',
+      content: '取消离职交接人也会清空',
+      okText: '确认',
+      cancelText: '取消',
+      onOk: () => {
+        let rowValue = selectedRows.value;
+        let rowData: any = [];
+        for (const value of rowValue) {
+          rowData.push(value.username);
+        }
+        handleCancelQuit({ id: toRaw(unref(selectedRowKeys)).join(','), username: rowData.join(',') });
+      },
+    });
+  }
+
+  //获取操作栏事件
+  function getTableAction(record) {
+    return [
+      {
+        label: '取消离职',
+        icon: 'ant-design:redo-outlined',
+        popConfirm: {
+          title: '是否取消离职,取消离职交接人也会清空',
+          confirm: handleCancelQuit.bind(null, record),
+        },
+      },
+    ];
+  }
+</script>
+
+<style scoped lang="less">
+:deep(.ant-popover-inner-content){
+  width: 185px !important;
+}
+</style>
diff --git a/jeecgboot-vue3/src/views/system/kejijuuser/UserRecycleBinModal.vue b/jeecgboot-vue3/src/views/system/kejijuuser/UserRecycleBinModal.vue
new file mode 100644
index 0000000..7b709f1
--- /dev/null
+++ b/jeecgboot-vue3/src/views/system/kejijuuser/UserRecycleBinModal.vue
@@ -0,0 +1,166 @@
+<template>
+  <BasicModal v-bind="$attrs" @register="registerModal" title="用户回收站" :showOkBtn="false" width="1000px" destroyOnClose @fullScreen="handleFullScreen">
+    <BasicTable @register="registerTable" :rowSelection="rowSelection" :scroll="scroll">
+      <!--插槽:table标题-->
+      <template #tableTitle>
+        <a-dropdown v-if="checkedKeys.length > 0">
+          <template #overlay>
+            <a-menu>
+              <a-menu-item key="1" @click="batchHandleDelete">
+                <Icon icon="ant-design:delete-outlined"></Icon>
+                批量删除
+              </a-menu-item>
+              <a-menu-item key="1" @click="batchHandleRevert">
+                <Icon icon="ant-design:redo-outlined"></Icon>
+                批量还原
+              </a-menu-item>
+            </a-menu>
+          </template>
+          <a-button
+            >批量操作
+            <Icon icon="ant-design:down-outlined"></Icon>
+          </a-button>
+        </a-dropdown>
+      </template>
+      <!--操作栏-->
+      <template #bodyCell="{ column, record }">
+        <template v-if="column.key === 'action'">
+          <TableAction :actions="getTableAction(record)" />
+        </template>
+      </template>
+    </BasicTable>
+  </BasicModal>
+</template>
+<script lang="ts" setup>
+  import { ref, toRaw, unref, watch } from 'vue';
+  import { BasicModal, useModalInner } from '/@/components/Modal';
+  import { BasicTable, useTable, TableAction } from '/@/components/Table';
+  import { recycleColumns } from './user.data';
+  import { getRecycleBinList, putRecycleBin, deleteRecycleBin } from './user.api';
+  import { useMessage } from '/@/hooks/web/useMessage';
+
+  const { createConfirm } = useMessage();
+  // 声明Emits
+  const emit = defineEmits(['success', 'register']);
+  const checkedKeys = ref<Array<string | number>>([]);
+  const [registerModal] = useModalInner(() => {
+    checkedKeys.value = [];
+  });
+  const scroll = ref({ y: 0 });
+  //注册table数据
+  const [registerTable, { reload }] = useTable({
+    api: getRecycleBinList,
+    columns: recycleColumns,
+    rowKey: 'id',
+    striped: true,
+    useSearchForm: false,
+    showTableSetting: false,
+    clickToRowSelect: false,
+    bordered: true,
+    showIndexColumn: false,
+    pagination: true,
+    tableSetting: { fullScreen: true },
+    canResize: false,
+    actionColumn: {
+      width: 150,
+      title: '操作',
+      dataIndex: 'action',
+      // slots: { customRender: 'action' },
+      fixed: undefined,
+    },
+  });
+  // update-begin--author:liaozhiyang---date:20240704---for：【TV360X-1657】系统用户回收站弹窗分页展示在可视区内
+  const handleFullScreen = (maximize) => {
+    setTableHeight(maximize);
+  };
+  const setTableHeight = (maximize) => {
+    const clientHeight = document.documentElement.clientHeight;
+    scroll.value = {
+      y: clientHeight - (maximize ? 300 : 500),
+    };
+  };
+  setTableHeight(false);
+  watch(
+    checkedKeys,
+    (newValue, oldValue) => {
+      if (checkedKeys.value.length && oldValue.length == 0) {
+        scroll.value = {
+          y: scroll.value.y - 50,
+        };
+      } else if (checkedKeys.value.length == 0 && oldValue.length) {
+        scroll.value = {
+          y: scroll.value.y + 50,
+        };
+      }
+    },
+    { deep: true }
+  );
+  // update-end--author:liaozhiyang---date:20240704---for：【TV360X-1657】系统用户回收站弹窗分页展示在可视区内
+  /**
+   * 选择列配置
+   */
+  const rowSelection = {
+    type: 'checkbox',
+    columnWidth: 50,
+    selectedRowKeys: checkedKeys,
+    onChange: onSelectChange,
+  };
+  /**
+   * 选择事件
+   */
+  function onSelectChange(selectedRowKeys: (string | number)[]) {
+    checkedKeys.value = selectedRowKeys;
+  }
+  /**
+   * 还原事件
+   */
+  async function handleRevert(record) {
+    await putRecycleBin({ userIds: record.id }, reload);
+    emit('success');
+  }
+  /**
+   * 批量还原事件
+   */
+  function batchHandleRevert() {
+    handleRevert({ id: toRaw(unref(checkedKeys)).join(',') });
+  }
+  /**
+   * 删除事件
+   */
+  async function handleDelete(record) {
+    await deleteRecycleBin({ userIds: record.id }, reload);
+  }
+  /**
+   * 批量删除事件
+   */
+  function batchHandleDelete() {
+    createConfirm({
+      iconType: 'warning',
+      title: '删除',
+      content: '确定要永久删除吗？删除后将不可恢复！',
+      onOk: () => handleDelete({ id: toRaw(unref(checkedKeys)).join(',') }),
+      onCancel() {},
+    });
+  }
+  //获取操作栏事件
+  function getTableAction(record) {
+    return [
+      {
+        label: '取回',
+        icon: 'ant-design:redo-outlined',
+        popConfirm: {
+          title: '是否确认还原',
+          confirm: handleRevert.bind(null, record),
+        },
+      },
+      {
+        label: '彻底删除',
+        icon: 'ant-design:scissor-outlined',
+        popConfirm: {
+          title: '是否确认删除',
+          confirm: handleDelete.bind(null, record),
+        },
+      },
+    ];
+  }
+</script>
diff --git a/jeecgboot-vue3/src/views/system/kejijuuser/index.vue b/jeecgboot-vue3/src/views/system/kejijuuser/index.vue
new file mode 100644
index 0000000..b8150bc
--- /dev/null
+++ b/jeecgboot-vue3/src/views/system/kejijuuser/index.vue
@@ -0,0 +1,301 @@
+<template>
+  <div>
+    <!--引用表格-->
+    <BasicTable @register="registerTable" :rowSelection="rowSelection">
+      <!--插槽:table标题-->
+      <template #tableTitle>
+        <a-button type="primary" preIcon="ant-design:plus-outlined" @click="handleCreate"> 新增</a-button>
+        <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls" :disabled="isDisabledAuth('system:user:export')"> 导出</a-button>
+<!--
+        <j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+-->
+        <a-button type="primary" @click="openModal(true, {})" preIcon="ant-design:hdd-outlined"> 回收站</a-button>
+        <a-dropdown v-if="selectedRowKeys.length > 0">
+          <template #overlay>
+            <a-menu>
+              <a-menu-item key="1" @click="batchHandleDelete">
+                <Icon icon="ant-design:delete-outlined"></Icon>
+                删除
+              </a-menu-item>
+              <a-menu-item key="2" @click="batchFrozen(2)">
+                <Icon icon="ant-design:lock-outlined"></Icon>
+                冻结
+              </a-menu-item>
+              <a-menu-item key="3" @click="batchFrozen(1)">
+                <Icon icon="ant-design:unlock-outlined"></Icon>
+                解冻
+              </a-menu-item>
+            </a-menu>
+          </template>
+          <a-button
+            >批量操作
+            <Icon icon="mdi:chevron-down"></Icon>
+          </a-button>
+        </a-dropdown>
+      </template>
+      <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)" />
+      </template>
+    </BasicTable>
+    <!--用户抽屉-->
+    <UserDrawer @register="registerDrawer" @success="handleSuccess" />
+    <!--修改密码-->
+    <PasswordModal @register="registerPasswordModal" @success="reload" />
+    <!--用户代理-->
+    <UserAgentModal @register="registerAgentModal" @success="reload" />
+    <!--回收站-->
+    <UserRecycleBinModal @register="registerModal" @success="reload" />
+    <!-- 离职受理人弹窗 -->
+    <UserQuitAgentModal @register="registerQuitAgentModal" @success="reload" />
+    <!-- 离职人员列弹窗 -->
+    <UserQuitModal @register="registerQuitModal" @success="reload" />
+  </div>
+</template>
+
+<script lang="ts" name="system-user" setup>
+  //ts语法
+  import { ref, computed, unref } from 'vue';
+  import { BasicTable, TableAction, ActionItem } from '/@/components/Table';
+  import UserDrawer from './UserDrawer.vue';
+  import UserRecycleBinModal from './UserRecycleBinModal.vue';
+  import PasswordModal from './PasswordModal.vue';
+  import UserAgentModal from './UserAgentModal.vue';
+  import JThirdAppButton from '/@/components/jeecg/thirdApp/JThirdAppButton.vue';
+  import UserQuitAgentModal from './UserQuitAgentModal.vue';
+  import UserQuitModal from './UserQuitModal.vue';
+  import { useDrawer } from '/@/components/Drawer';
+  import { useListPage } from '/@/hooks/system/useListPage';
+  import { useModal } from '/@/components/Modal';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import { columns, searchFormSchema } from './user.data';
+  import { listNoCareTenant, deleteUser, batchDeleteUser, getImportUrl, getExportUrl, frozenBatch } from './user.api';
+  import {usePermission} from "/@/hooks/web/usePermission";
+
+  const { createMessage, createConfirm } = useMessage();
+  const { isDisabledAuth } = usePermission();
+  //注册drawer
+  const [registerDrawer, { openDrawer }] = useDrawer();
+  //回收站model
+  const [registerModal, { openModal }] = useModal();
+  //密码model
+  const [registerPasswordModal, { openModal: openPasswordModal }] = useModal();
+  //代理人model
+  const [registerAgentModal, { openModal: openAgentModal }] = useModal();
+  //离职代理人model
+  const [registerQuitAgentModal, { openModal: openQuitAgentModal }] = useModal();
+  //离职用户列表model
+  const [registerQuitModal, { openModal: openQuitModal }] = useModal();
+
+  // 列表页面公共参数、方法
+  const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
+    designScope: 'user-list',
+    tableProps: {
+      title: '用户列表',
+      api: listNoCareTenant,
+      columns: columns,
+      size: 'small',
+      formConfig: {
+        // labelWidth: 200,
+        schemas: searchFormSchema,
+      },
+      actionColumn: {
+        width: 120,
+      },
+      beforeFetch: (params) => {
+        return Object.assign({ column: 'createTime', order: 'desc' }, params);
+      },
+    },
+    exportConfig: {
+      name: '用户列表',
+      url: getExportUrl,
+    },
+    importConfig: {
+      url: getImportUrl,
+    },
+  });
+
+  //注册table数据
+  const [registerTable, { reload, updateTableDataRecord }, { rowSelection, selectedRows, selectedRowKeys }] = tableContext;
+
+  /**
+   * 新增事件
+   */
+  function handleCreate() {
+    openDrawer(true, {
+      isUpdate: false,
+      showFooter: true,
+      tenantSaas: false,
+    });
+  }
+  /**
+   * 编辑事件
+   */
+  async function handleEdit(record: Recordable) {
+    openDrawer(true, {
+      record,
+      isUpdate: true,
+      showFooter: true,
+      tenantSaas: false,
+    });
+  }
+  /**
+   * 详情
+   */
+  async function handleDetail(record: Recordable) {
+    openDrawer(true, {
+      record,
+      isUpdate: true,
+      showFooter: false,
+      tenantSaas: false,
+    });
+  }
+  /**
+   * 删除事件
+   */
+  async function handleDelete(record) {
+    if ('admin' == record.username) {
+      createMessage.warning('管理员账号不允许此操作！');
+      return;
+    }
+    await deleteUser({ id: record.id }, reload);
+  }
+  /**
+   * 批量删除事件
+   */
+  async function batchHandleDelete() {
+    let hasAdmin = unref(selectedRows).filter((item) => item.username == 'admin');
+    if (unref(hasAdmin).length > 0) {
+      createMessage.warning('管理员账号不允许此操作！');
+      return;
+    }
+    await batchDeleteUser({ ids: selectedRowKeys.value }, () => {
+      selectedRowKeys.value = [];
+      reload();
+    });
+  }
+  /**
+   * 成功回调
+   */
+  function handleSuccess() {
+    reload();
+  }
+
+  /**
+   * 打开修改密码弹窗
+   */
+  function handleChangePassword(username) {
+    openPasswordModal(true, { username });
+  }
+  /**
+   * 打开代理人弹窗
+   */
+  function handleAgentSettings(userName) {
+    openAgentModal(true, { userName });
+  }
+  /**
+   * 冻结解冻
+   */
+  async function handleFrozen(record, status) {
+    if ('admin' == record.username) {
+      createMessage.warning('管理员账号不允许此操作！');
+      return;
+    }
+    await frozenBatch({ ids: record.id, status: status }, reload);
+  }
+  /**
+   * 批量冻结解冻
+   */
+  function batchFrozen(status) {
+    let hasAdmin = selectedRows.value.filter((item) => item.username == 'admin');
+    if (unref(hasAdmin).length > 0) {
+      createMessage.warning('管理员账号不允许此操作！');
+      return;
+    }
+    createConfirm({
+      iconType: 'warning',
+      title: '确认操作',
+      content: '是否' + (status == 1 ? '解冻' : '冻结') + '选中账号?',
+      onOk: async () => {
+        await frozenBatch({ ids: unref(selectedRowKeys).join(','), status: status }, reload);
+      },
+    });
+  }
+
+  /**
+   *同步钉钉和微信回调
+   */
+  function onSyncFinally({ isToLocal }) {
+    // 同步到本地时刷新下数据
+    if (isToLocal) {
+      reload();
+    }
+  }
+
+  /**
+   * 操作栏
+   */
+  function getTableAction(record): ActionItem[] {
+    return [
+      {
+        label: '编辑',
+        onClick: handleEdit.bind(null, record),
+        // ifShow: () => hasPermission('system:user:edit'),
+      },
+    ];
+  }
+  /**
+   * 下拉操作栏
+   */
+  function getDropDownAction(record): ActionItem[] {
+    return [
+      {
+        label: '详情',
+        onClick: handleDetail.bind(null, record),
+      },
+      {
+        label: '密码',
+        //auth: 'user:changepwd',
+        onClick: handleChangePassword.bind(null, record.username),
+      },
+      {
+        label: '删除',
+        popConfirm: {
+          title: '是否确认删除',
+          confirm: handleDelete.bind(null, record),
+        },
+      },
+      {
+        label: '冻结',
+        ifShow: record.status == 1,
+        popConfirm: {
+          title: '确定冻结吗?',
+          confirm: handleFrozen.bind(null, record, 2),
+        },
+      },
+      {
+        label: '解冻',
+        ifShow: record.status == 2,
+        popConfirm: {
+          title: '确定解冻吗?',
+          confirm: handleFrozen.bind(null, record, 1),
+        },
+      },
+      {
+        label: '代理人',
+        onClick: handleAgentSettings.bind(null, record.username),
+      },
+    ];
+  }
+
+  /**
+   * 离职
+   * @param userName
+   */
+  function handleQuit(userName) {
+    //打开离职代理人弹窗
+    openQuitAgentModal(true, { userName });
+  }
+</script>
+
+<style scoped></style>
diff --git a/jeecgboot-vue3/src/views/system/kejijuuser/user.api.ts b/jeecgboot-vue3/src/views/system/kejijuuser/user.api.ts
new file mode 100644
index 0000000..fea5d59
--- /dev/null
+++ b/jeecgboot-vue3/src/views/system/kejijuuser/user.api.ts
@@ -0,0 +1,254 @@
+import { defHttp } from '/@/utils/http/axios';
+import { Modal } from 'ant-design-vue';
+import { isObject } from '/@/utils/is';
+enum Api {
+  listNoCareTenant = '/sys/user/listAll',
+
+  // 根据用户角色查询所属用户 add by zhc 11.08
+  listByRollCode = '/sys/user/listByRollCode',
+  list = '/sys/user/list',
+  save = '/sys/user/add',
+  edit = '/sys/user/edit',
+  agentSave = '/sys/sysUserAgent/add',
+  agentEdit = '/sys/sysUserAgent/edit',
+  getUserRole = '/sys/user/queryUserRole',
+  duplicateCheck = '/sys/duplicate/check',
+  deleteUser = '/sys/user/delete',
+  deleteBatch = '/sys/user/deleteBatch',
+  importExcel = '/sys/user/importExcel',
+  exportXls = '/sys/user/exportXls',
+  recycleBinList = '/sys/user/recycleBin',
+  putRecycleBin = '/sys/user/putRecycleBin',
+  deleteRecycleBin = '/sys/user/deleteRecycleBin',
+  allRolesList = '/sys/role/queryall',
+  allRolesListNoByTenant = '/sys/role/queryallNoByTenant',
+  allTenantList = '/sys/tenant/queryList',
+  allPostList = '/sys/position/list',
+  userDepartList = '/sys/user/userDepartList',
+  changePassword = '/sys/user/changePassword',
+  frozenBatch = '/sys/user/frozenBatch',
+  getUserAgent = '/sys/sysUserAgent/queryByUserName',
+  userQuitAgent = '/sys/user/userQuitAgent',
+  getQuitList = '/sys/user/getQuitList',
+  putCancelQuit = '/sys/user/putCancelQuit',
+  updateUserTenantStatus='/sys/tenant/updateUserTenantStatus',
+  getUserTenantPageList='/sys/tenant/getUserTenantPageList',
+}
+/**
+ * 导出api
+ * @param params
+ */
+export const getExportUrl = Api.exportXls;
+/**
+ * 导入api
+ */
+export const getImportUrl = Api.importExcel;
+/**
+ * 列表接口(查询用户，通过租户隔离)
+ * @param params
+ */
+export const list = (params) => defHttp.get({ url: Api.list, params });
+
+/**
+ * 列表接口(查询全部用户，不通过租户隔离)
+ * @param params
+ */
+export const listNoCareTenant = (params) => defHttp.get({ url: Api.listByRollCode, params });
+
+/**
+ * 用户角色接口
+ * @param params
+ */
+export const getUserRoles = (params) => defHttp.get({ url: Api.getUserRole, params }, { errorMessageMode: 'none' });
+
+/**
+ * 删除用户
+ */
+export const deleteUser = (params, handleSuccess) => {
+  return defHttp.delete({ url: Api.deleteUser, params }, { joinParamsToUrl: true }).then(() => {
+    handleSuccess();
+  });
+};
+/**
+ * 批量删除用户
+ * @param params
+ */
+export const batchDeleteUser = (params, handleSuccess) => {
+  Modal.confirm({
+    title: '确认删除',
+    content: '是否删除选中数据',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.delete({ url: Api.deleteBatch, data: params }, { joinParamsToUrl: true }).then(() => {
+        handleSuccess();
+      });
+    },
+  });
+};
+/**
+ * 保存或者更新用户
+ * @param params
+ */
+export const saveOrUpdateUser = (params, isUpdate) => {
+  let url = isUpdate ? Api.edit : Api.save;
+  return defHttp.post({ url: url, params });
+};
+/**
+ * 唯一校验
+ * @param params
+ */
+export const duplicateCheck = (params) => defHttp.get({ url: Api.duplicateCheck, params }, { isTransformResponse: false });
+
+/**
+ * 20231215
+ * liaozhiyang
+ * 唯一校验（ 延迟【防抖】）
+ * @param params
+ */
+const timer = {};
+export const duplicateCheckDelay = (params) => {
+  return new Promise((resove, rejected) => {
+    // -update-begin--author:liaozhiyang---date:20240619---for：【TV360X-1380】表单中使用多个duplicateCheckDelay，validate方法调用时会导致promise被挂起保存不了
+    let key;
+    if (isObject(params)) {
+      key = `${params.tableName}_${params.fieldName}`;
+    } else {
+      key = params;
+    }
+    clearTimeout(timer[key]);
+    // -update-end--author:liaozhiyang---date:20240619---for：【TV360X-1380】表单中使用多个duplicateCheckDelay，validate方法调用时会导致promise被挂起保存不了
+    timer[key] = setTimeout(() => {
+      defHttp
+        .get({ url: Api.duplicateCheck, params }, { isTransformResponse: false })
+        .then((res: any) => {
+          resove(res as any);
+        })
+        .catch((error) => {
+          rejected(error);
+        });
+      delete timer[key];
+    }, 500);
+  });
+};
+/**
+ * 获取全部角色（租户隔离）
+ * @param params
+ */
+export const getAllRolesList = (params) => defHttp.get({ url: Api.allRolesList, params });
+/**
+ * 获取全部角色（不租户隔离）
+ * @param params
+ */
+export const getAllRolesListNoByTenant = (params) => defHttp.get({ url: Api.allRolesListNoByTenant, params });
+/**
+ * 获取全部租户
+ */
+export const getAllTenantList = (params) => defHttp.get({ url: Api.allTenantList, params });
+/**
+ * 获取指定用户负责部门
+ */
+export const getUserDepartList = (params) => defHttp.get({ url: Api.userDepartList, params }, { successMessageMode: 'none' });
+/**
+ * 获取全部职务
+ */
+export const getAllPostList = (params) => {
+  return new Promise((resolve) => {
+    defHttp.get({ url: Api.allPostList, params }).then((res) => {
+      resolve(res.records);
+    });
+  });
+};
+/**
+ * 回收站列表
+ * @param params
+ */
+export const getRecycleBinList = (params) => defHttp.get({ url: Api.recycleBinList, params });
+/**
+ * 回收站还原
+ * @param params
+ */
+export const putRecycleBin = (params, handleSuccess) => {
+  return defHttp.put({ url: Api.putRecycleBin, params }).then(() => {
+    handleSuccess();
+  });
+};
+/**
+ * 回收站删除
+ * @param params
+ */
+export const deleteRecycleBin = (params, handleSuccess) => {
+  return defHttp.delete({ url: Api.deleteRecycleBin, params }, { joinParamsToUrl: true }).then(() => {
+    handleSuccess();
+  });
+};
+/**
+ * 修改密码
+ * @param params
+ */
+export const changePassword = (params) => {
+  return defHttp.put({ url: Api.changePassword, params });
+};
+/**
+ * 冻结解冻
+ * @param params
+ */
+export const frozenBatch = (params, handleSuccess) => {
+  return defHttp.put({ url: Api.frozenBatch, params }).then(() => {
+    handleSuccess();
+  });
+};
+/**
+ * 获取用户代理
+ * @param params
+ */
+export const getUserAgent = (params) => defHttp.get({ url: Api.getUserAgent, params }, { isTransformResponse: false });
+/**
+ * 保存或者更新用户代理
+ * @param params
+ */
+export const saveOrUpdateAgent = (params) => {
+  let url = params.id ? Api.agentEdit : Api.agentSave;
+  return defHttp.post({ url: url, params });
+};
+
+/**
+ * 用户离职(新增代理人和用户状态变更操作)
+ * @param params
+ */
+export const userQuitAgent = (params) => {
+  return defHttp.put({ url: Api.userQuitAgent, params });
+};
+
+/**
+ * 用户离职列表
+ * @param params
+ */
+export const getQuitList = (params) => {
+  return defHttp.get({ url: Api.getQuitList, params });
+};
+
+/**
+ * 取消离职
+ * @param params
+ */
+export const putCancelQuit = (params, handleSuccess) => {
+  return defHttp.put({ url: Api.putCancelQuit, params }, { joinParamsToUrl: true }).then(() => {
+    handleSuccess();
+  });
+};
+
+/**
+ * 待审批获取列表数据
+ */
+export const getUserTenantPageList = (params) => {
+  return defHttp.get({ url: Api.getUserTenantPageList, params });
+};
+
+/**
+ * 更新租户状态
+ * @param params
+ */
+export const updateUserTenantStatus = (params) => {
+  return defHttp.put({ url: Api.updateUserTenantStatus, params }, { joinParamsToUrl: true, isTransformResponse: false });
+};
diff --git a/jeecgboot-vue3/src/views/system/kejijuuser/user.data.ts b/jeecgboot-vue3/src/views/system/kejijuuser/user.data.ts
new file mode 100644
index 0000000..9ec1313
--- /dev/null
+++ b/jeecgboot-vue3/src/views/system/kejijuuser/user.data.ts
@@ -0,0 +1,569 @@
+import { BasicColumn } from '/@/components/Table';
+import { FormSchema } from '/@/components/Table';
+import { getAllRolesListNoByTenant, getAllTenantList } from './user.api';
+import { rules } from '/@/utils/helper/validator';
+import { render } from '/@/utils/common/renderUtils';
+export const columns: BasicColumn[] = [
+  {
+    title: '用户账号',
+    dataIndex: 'username',
+    width: 120,
+  },
+  {
+    title: '用户姓名',
+    dataIndex: 'realname',
+    width: 100,
+  },
+  {
+    title: '头像',
+    dataIndex: 'avatar',
+    width: 120,
+    customRender: render.renderAvatar,
+  },
+  {
+    title: '性别',
+    dataIndex: 'sex',
+    width: 80,
+    sorter: true,
+    customRender: ({ text }) => {
+      return render.renderDict(text, 'sex');
+    },
+  },
+  /*{
+    title: '生日',
+    dataIndex: 'birthday',
+    width: 100,
+  },*/
+  {
+    title: '手机号',
+    dataIndex: 'phone',
+    width: 100,
+  },
+  {
+    title: '部门',
+    width: 150,
+    dataIndex: 'orgCodeTxt',
+  },
+  /*{
+    title: '负责部门',
+    width: 150,
+    dataIndex: 'departIds_dictText',
+  },*/
+  {
+    title: '状态',
+    dataIndex: 'status_dictText',
+    width: 80,
+  },
+];
+
+export const recycleColumns: BasicColumn[] = [
+  {
+    title: '用户账号',
+    dataIndex: 'username',
+    width: 100,
+  },
+  {
+    title: '用户姓名',
+    dataIndex: 'realname',
+    width: 100,
+  },
+  {
+    title: '头像',
+    dataIndex: 'avatar',
+    width: 80,
+    customRender: render.renderAvatar,
+  },
+  {
+    title: '性别',
+    dataIndex: 'sex',
+    width: 80,
+    sorter: true,
+    customRender: ({ text }) => {
+      return render.renderDict(text, 'sex');
+    },
+  },
+];
+
+export const searchFormSchema: FormSchema[] = [
+  {
+    label: '账号',
+    field: 'username',
+    component: 'JInput',
+    //colProps: { span: 6 },
+  },
+  {
+    label: '名字',
+    field: 'realname',
+    component: 'JInput',
+   //colProps: { span: 6 },
+  },
+  {
+    label: '性别',
+    field: 'sex',
+    component: 'JDictSelectTag',
+    componentProps: {
+      dictCode: 'sex',
+      placeholder: '请选择性别',
+      stringToNumber: true,
+    },
+    //colProps: { span: 6 },
+  },
+  {
+    label: '手机号码',
+    field: 'phone',
+    component: 'Input',
+    //colProps: { span: 6 },
+  },
+  {
+    label: '用户状态',
+    field: 'status',
+    component: 'JDictSelectTag',
+    componentProps: {
+      dictCode: 'user_status',
+      placeholder: '请选择状态',
+      stringToNumber: true,
+    },
+   //colProps: { span: 6 },
+  },
+];
+
+export const formSchema: FormSchema[] = [
+  {
+    label: '',
+    field: 'id',
+    component: 'Input',
+    show: false,
+  },
+  {
+    label: '用户账号',
+    field: 'username',
+    component: 'Input',
+    required: true,
+    dynamicDisabled: ({ values }) => {
+      return !!values.id;
+    },
+    dynamicRules: ({ model, schema }) => rules.duplicateCheckRule('sys_user', 'username', model, schema, true),
+  },
+  {
+    label: '登录密码',
+    field: 'password',
+    component: 'StrengthMeter',
+    componentProps:{
+      autocomplete: 'new-password',
+    },
+    rules: [
+      {
+        required: true,
+        message: '请输入登录密码',
+      },
+      {
+        pattern: /^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,./]).{8,}$/,
+        message: '密码由8位数字、大小写字母和特殊符号组成!',
+      },
+    ],
+  },
+  {
+    label: '确认密码',
+    field: 'confirmPassword',
+    component: 'InputPassword',
+    dynamicRules: ({ values }) => rules.confirmPassword(values, true),
+  },
+  {
+    label: '用户姓名',
+    field: 'realname',
+    required: true,
+    component: 'Input',
+  },
+  /*{
+    label: '工号',
+    field: 'workNo',
+    required: true,
+    component: 'Input',
+    dynamicRules: ({ model, schema }) => rules.duplicateCheckRule('sys_user', 'work_no', model, schema, true),
+  },
+  {
+    label: '职务',
+    field: 'post',
+    required: false,
+    component: 'JSelectPosition',
+    componentProps: {
+      labelKey: 'name',
+    },
+  },*/
+  {
+    label: '角色',
+    field: 'selectedroles',
+    component: 'ApiSelect',
+    componentProps: {
+      mode: 'multiple',
+      api: getAllRolesListNoByTenant,
+      labelField: 'roleName',
+      valueField: 'id',
+      immediate: false,
+    },
+  },
+  {
+    label: '所属部门',
+    field: 'selecteddeparts',
+    component: 'JSelectDept',
+    componentProps: ({ formActionType, formModel }) => {
+      return {
+        sync: false,
+        checkStrictly: true,
+        defaultExpandLevel: 2,
+
+        onSelect: (options, values) => {
+          const { updateSchema } = formActionType;
+          //所属部门修改后更新负责部门下拉框数据
+          updateSchema([
+            {
+              field: 'departIds',
+              componentProps: { options },
+            },
+          ]);
+          //update-begin---author:wangshuai---date:2024-05-11---for:【issues/1222】用户编辑界面“所属部门”与“负责部门”联动出错整---
+          if(!values){
+            formModel.departIds = [];
+            return;
+          }
+          //update-end---author:wangshuai---date:2024-05-11---for:【issues/1222】用户编辑界面“所属部门”与“负责部门”联动出错整---
+          //所属部门修改后更新负责部门数据
+          formModel.departIds && (formModel.departIds = formModel.departIds.filter((item) => values.value.indexOf(item) > -1));
+        },
+      };
+    },
+  },
+  /*{
+    label: '租户',
+    field: 'relTenantIds',
+    component: 'ApiSelect',
+    componentProps: {
+      mode: 'multiple',
+      api: getAllTenantList,
+      numberToString: true,
+      labelField: 'name',
+      valueField: 'id',
+      immediate: false,
+    },
+  },
+  {
+    label: '身份',
+    field: 'userIdentity',
+    component: 'RadioGroup',
+    defaultValue: 1,
+    componentProps: ({ formModel }) => {
+      return {
+        options: [
+          { label: '普通用户', value: 1, key: '1' },
+          { label: '上级', value: 2, key: '2' },
+        ],
+        onChange: () => {
+          formModel.userIdentity == 1 && (formModel.departIds = []);
+        },
+      };
+    },
+  },*/
+  {
+    label: '负责部门',
+    field: 'departIds',
+    component: 'Select',
+    componentProps: {
+      mode: 'multiple',
+    },
+    ifShow: ({ values }) => values.userIdentity == 2,
+  },
+  {
+    label: '头像',
+    field: 'avatar',
+    component: 'JImageUpload',
+    componentProps: {
+      fileMax: 1,
+    },
+  },
+  {
+    label: '生日',
+    field: 'birthday',
+    component: 'DatePicker',
+  },
+  {
+    label: '性别',
+    field: 'sex',
+    component: 'JDictSelectTag',
+    componentProps: {
+      dictCode: 'sex',
+      placeholder: '请选择性别',
+      stringToNumber: true,
+    },
+  },
+  {
+    label: '邮箱',
+    field: 'email',
+    component: 'Input',
+    required: true,
+    dynamicRules: ({ model, schema }) => {
+      return [
+        { ...rules.duplicateCheckRule('sys_user', 'email', model, schema, true)[0], trigger: 'blur' },
+        { ...rules.rule('email', false)[0], trigger: 'blur' },
+      ];
+    },
+  },
+  {
+    label: '手机号码',
+    field: 'phone',
+    component: 'Input',
+    required: true,
+    dynamicRules: ({ model, schema }) => {
+      return [
+        { ...rules.duplicateCheckRule('sys_user', 'phone', model, schema, true)[0], trigger: 'blur' },
+        { pattern: /^1[3456789]\d{9}$/, message: '手机号码格式有误', trigger: 'blur' },
+      ];
+    },
+  },
+ /* {
+    label: '座机',
+    field: 'telephone',
+    component: 'Input',
+    rules: [{ pattern: /^0\d{2,3}-[1-9]\d{6,7}$/, message: '请输入正确的座机号码' }],
+  },
+  {
+    label: '工作流引擎',
+    field: 'activitiSync',
+    defaultValue: 1,
+    component: 'JDictSelectTag',
+    componentProps: {
+      dictCode: 'activiti_sync',
+      type: 'radio',
+      stringToNumber: true,
+    },
+  },*/
+];
+
+export const formPasswordSchema: FormSchema[] = [
+  {
+    label: '用户账号',
+    field: 'username',
+    component: 'Input',
+    componentProps: { readOnly: true },
+  },
+  {
+    label: '登录密码',
+    field: 'password',
+    component: 'StrengthMeter',
+    componentProps: {
+      placeholder: '请输入登录密码',
+    },
+    rules: [
+      {
+        required: true,
+        message: '请输入登录密码',
+      },
+      {
+        pattern: /^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,./]).{8,}$/,
+        message: '密码由8位数字、大小写字母和特殊符号组成!',
+      },
+    ],
+  },
+  {
+    label: '确认密码',
+    field: 'confirmPassword',
+    component: 'InputPassword',
+    dynamicRules: ({ values }) => rules.confirmPassword(values, true),
+  },
+];
+
+export const formAgentSchema: FormSchema[] = [
+  {
+    label: '',
+    field: 'id',
+    component: 'Input',
+    show: false,
+  },
+  {
+    field: 'userName',
+    label: '用户名',
+    component: 'Input',
+    componentProps: {
+      readOnly: true,
+      allowClear: false,
+    },
+  },
+  {
+    field: 'agentUserName',
+    label: '代理人用户名',
+    required: true,
+    component: 'JSelectUser',
+    componentProps: {
+      rowKey: 'username',
+      labelKey: 'realname',
+      maxSelectCount: 10,
+    },
+  },
+  {
+    field: 'startTime',
+    label: '代理开始时间',
+    component: 'DatePicker',
+    required: true,
+    componentProps: {
+      showTime: true,
+      valueFormat: 'YYYY-MM-DD HH:mm:ss',
+      placeholder: '请选择代理开始时间',
+      getPopupContainer: () => document.body,
+    },
+  },
+  {
+    field: 'endTime',
+    label: '代理结束时间',
+    component: 'DatePicker',
+    required: true,
+    componentProps: {
+      showTime: true,
+      valueFormat: 'YYYY-MM-DD HH:mm:ss',
+      placeholder: '请选择代理结束时间',
+      getPopupContainer: () => document.body,
+    },
+  },
+  {
+    field: 'status',
+    label: '状态',
+    component: 'JDictSelectTag',
+    defaultValue: '1',
+    componentProps: {
+      dictCode: 'valid_status',
+      type: 'radioButton',
+    },
+  },
+];
+
+export const formQuitAgentSchema: FormSchema[] = [
+  {
+    label: '',
+    field: 'id',
+    component: 'Input',
+    show: false,
+  },
+  {
+    field: 'userName',
+    label: '用户名',
+    component: 'Input',
+    componentProps: {
+      readOnly: true,
+      allowClear: false,
+    },
+  },
+  {
+    field: 'agentUserName',
+    label: '交接人员',
+    //required: true,
+    component: 'JSelectUser',
+    componentProps: {
+      rowKey: 'username',
+      labelKey: 'realname',
+      maxSelectCount: 1,
+    },
+  },
+  {
+    field: 'startTime',
+    label: '交接开始时间',
+    component: 'DatePicker',
+    //required: true,
+    componentProps: {
+      showTime: true,
+      valueFormat: 'YYYY-MM-DD HH:mm:ss',
+      placeholder: '请选择交接开始时间',
+      getPopupContainer: () => document.body,
+    },
+  },
+  {
+    field: 'endTime',
+    label: '交接结束时间',
+    component: 'DatePicker',
+    //required: true,
+    componentProps: {
+      showTime: true,
+      valueFormat: 'YYYY-MM-DD HH:mm:ss',
+      placeholder: '请选择交接结束时间',
+      getPopupContainer: () => document.body,
+    },
+  },
+  {
+    field: 'status',
+    label: '状态',
+    component: 'JDictSelectTag',
+    defaultValue: '1',
+    componentProps: {
+      dictCode: 'valid_status',
+      type: 'radioButton',
+    },
+  },
+];
+
+//租户用户列表
+export const userTenantColumns: BasicColumn[] = [
+  {
+    title: '用户账号',
+    dataIndex: 'username',
+    width: 120,
+  },
+  {
+    title: '用户姓名',
+    dataIndex: 'realname',
+    width: 100,
+  },
+  {
+    title: '头像',
+    dataIndex: 'avatar',
+    width: 120,
+    customRender: render.renderAvatar,
+  },
+  {
+    title: '手机号',
+    dataIndex: 'phone',
+    width: 100,
+  },
+  {
+    title: '部门',
+    width: 150,
+    dataIndex: 'orgCodeTxt',
+  },
+  {
+    title: '状态',
+    dataIndex: 'status',
+    width: 80,
+    customRender: ({ text }) => {
+      if (text === '1') {
+        return '正常';
+      } else if (text === '3') {
+        return '审批中';
+      } else {
+        return '已拒绝';
+      }
+    },
+  },
+];
+
+//用户租户搜索表单
+export const userTenantFormSchema: FormSchema[] = [
+  {
+    label: '账号',
+    field: 'username',
+    component: 'Input',
+    colProps: { span: 6 },
+  },
+  {
+    label: '名字',
+    field: 'realname',
+    component: 'Input',
+    colProps: { span: 6 },
+  },
+  {
+    label: '性别',
+    field: 'sex',
+    component: 'JDictSelectTag',
+    componentProps: {
+      dictCode: 'sex',
+      placeholder: '请选择性别',
+      stringToNumber: true,
+    },
+    colProps: { span: 6 },
+  },
+];
diff --git a/jeecgboot-vue3/src/views/system/kejijuuser/userDetails.vue b/jeecgboot-vue3/src/views/system/kejijuuser/userDetails.vue
new file mode 100644
index 0000000..c0a8cd4
--- /dev/null
+++ b/jeecgboot-vue3/src/views/system/kejijuuser/userDetails.vue
@@ -0,0 +1,54 @@
+<template>
+  <Description @register="register" class="mt-4" />
+</template>
+<script lang="ts">
+  import { defineComponent } from 'vue';
+  import { Description, DescItem, useDescription } from '/@/components/Description/index';
+  const mockData = {
+    username: 'test',
+    nickName: 'VB',
+    age: '123',
+    phone: '15695909xxx',
+    email: '190848757@qq.com',
+    addr: '厦门市思明区',
+    sex: '男',
+    certy: '3504256199xxxxxxxxx',
+    tag: 'orange',
+  };
+  const schema: DescItem[] = [
+    {
+      field: 'username',
+      label: '用户名',
+    },
+    {
+      field: 'nickName',
+      label: '昵称',
+      render: (curVal, data) => {
+        return `${data.username}-${curVal}`;
+      },
+    },
+    {
+      field: 'phone',
+      label: '联系电话',
+    },
+    {
+      field: 'email',
+      label: '邮箱',
+    },
+    {
+      field: 'addr',
+      label: '地址',
+    },
+  ];
+  export default defineComponent({
+    components: { Description },
+    setup() {
+      const [register] = useDescription({
+        title: 'useDescription',
+        data: mockData,
+        schema: schema,
+      });
+      return { mockData, schema, register };
+    },
+  });
+</script>

From e3330f7dae492d71b48fa423ded6a20c61197115 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=AE=B6=E4=B8=9C?= <1654135867@qq.com>
Date: Fri, 8 Nov 2024 15:40:11 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E4=B8=93=E5=AE=B6=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../expert/controller/ExpertController.java   | 37 ++++++++++
 .../modules/demo/expert/entity/ExpdefVo.java  |  9 +++
 .../modules/demo/expert/entity/Expert.java    |  1 +
 .../workbench/components/DynamicInfo.vue      | 23 ++++--
 .../workbench/components/ProjectCard.vue      | 73 +++++++++++++++----
 .../workbench/components/QuickNav.vue         |  4 +-
 .../workbench/components/SaleRadar.vue        |  4 +-
 .../workbench/components/WorkbenchHeader.vue  | 14 ----
 .../dashboard/workbench/components/api.ts     | 27 +++++++
 .../expert/admin/components/ExpertForm.vue    |  9 ++-
 .../adminback/components/ExpertForm.vue       | 10 ++-
 .../expert/county/components/ExpertForm.vue   |  9 ++-
 .../expert/firm/components/ExpertForm.vue     | 10 ++-
 .../expert/self/components/ExpertForm.vue     |  8 +-
 14 files changed, 191 insertions(+), 47 deletions(-)
 create mode 100644 jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/entity/ExpdefVo.java
 create mode 100644 jeecgboot-vue3/src/views/dashboard/workbench/components/api.ts

diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/controller/ExpertController.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/controller/ExpertController.java
index d219ff0..3d6cf8d 100644
--- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/controller/ExpertController.java
+++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/controller/ExpertController.java
@@ -20,6 +20,7 @@ import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.demo.disciplinefieid.entity.DisciplineFieid;
 import org.jeecg.modules.demo.disciplinefieid.service.IDisciplineFieidService;
 import org.jeecg.modules.demo.expert.entity.ExpCmsVo;
+import org.jeecg.modules.demo.expert.entity.ExpdefVo;
 import org.jeecg.modules.demo.expert.entity.Expert;
 import org.jeecg.modules.demo.expert.service.IExpertService;
 
@@ -739,4 +740,40 @@ public class ExpertController extends JeecgController<Expert, IExpertService> {
 		 expCmsVo.setRealname(sysUser.getRealname());
 		 return Result.OK(expCmsVo);
 	 }
+	 @ApiOperation(value="管理员专家数据---专家总数", notes="管理员专家数据---专家总数")
+	 @GetMapping(value = "/expdatanumber")
+	 public Result<Integer> expdatanumber() {
+		 List<Expert> expertList = expertService.list();
+		 return Result.OK(expertList.size());
+	 }
+
+	 @ApiOperation(value="管理员专家数据---正常专家数", notes="管理员专家数据---正常专家数")
+	 @GetMapping(value = "/expdatanumberzc")
+	 public Result<Integer> expdatanumberzc() {
+		 List<Expert> expertList = expertService.query().eq("adminopen","2").eq("compopen","2").eq("expsture","N").list();
+		 return Result.OK(expertList.size());
+	 }
+
+	 @ApiOperation(value="管理员专家数据---异常专家数", notes="管理员专家数据---异常专家数")
+	 @GetMapping(value = "/expdatanumberyc")
+	 public Result<Integer> expdatanumberyc() {
+		 List<Expert> expertList = expertService.query().eq("adminopen","2").eq("compopen","2").eq("expsture","Y").list();
+		 return Result.OK(expertList.size());
+	 }
+
+	 @ApiOperation(value="管理员专家数据---不同的领域专家数", notes="管理员专家数据---不同的领域专家数")
+	 @GetMapping(value = "/expdatanumberdiffect")
+	 public Result<List<ExpdefVo>> expdatanumberdiffect() {
+		 List<ExpdefVo> expdefVoList = new ArrayList<>();
+		List<DisciplineFieid> disciplineFieidList = disciplineFieidService.list();
+		for (int i=0;i<disciplineFieidList.size();i++){
+			ExpdefVo expdefVo =new ExpdefVo();
+			List<Expert> expertList = expertService.query().eq("compopen","2").eq("adminopen","2").eq("directioncal",disciplineFieidList.get(i).getId()).list();
+			expdefVo.setName(disciplineFieidList.get(i).getName());
+			expdefVo.setNumber(expertList.size());
+			expdefVoList.add(expdefVo);
+		}
+		 return Result.OK(expdefVoList);
+	 }
+
 }
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/entity/ExpdefVo.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/entity/ExpdefVo.java
new file mode 100644
index 0000000..f613479
--- /dev/null
+++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/entity/ExpdefVo.java
@@ -0,0 +1,9 @@
+package org.jeecg.modules.demo.expert.entity;
+
+import lombok.Data;
+
+@Data
+public class ExpdefVo {
+    private String name;
+    private Integer number;
+}
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/entity/Expert.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/entity/Expert.java
index 16b8a8e..0391aa9 100644
--- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/entity/Expert.java
+++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/entity/Expert.java
@@ -120,6 +120,7 @@ public class Expert implements Serializable {
     private java.lang.String expsture;
     /**异常备注*/
     @Excel(name = "异常备注", width = 15)
+    @Dict(dicCode = "yczt")
     @ApiModelProperty(value = "异常备注")
     private java.lang.String errinfo;
 
diff --git a/jeecgboot-vue3/src/views/dashboard/workbench/components/DynamicInfo.vue b/jeecgboot-vue3/src/views/dashboard/workbench/components/DynamicInfo.vue
index 4be8f1f..eb187f2 100644
--- a/jeecgboot-vue3/src/views/dashboard/workbench/components/DynamicInfo.vue
+++ b/jeecgboot-vue3/src/views/dashboard/workbench/components/DynamicInfo.vue
@@ -1,14 +1,14 @@
 <template>
-  <Card title="最新动态" v-bind="$attrs">
+  <Card title="单个领域专家个数" v-bind="$attrs">
     <template #extra>
-      <a-button type="link" size="small">更多</a-button>
+
     </template>
     <List item-layout="horizontal" :data-source="dynamicInfoItems">
       <template #renderItem="{ item }">
         <ListItem>
           <ListItemMeta>
             <template #description>
-              {{ item.date }}
+              {{ item.number }}
             </template>
             <!-- eslint-disable-next-line -->
             <template #title> {{ item.name }} <span v-html="item.desc"> </span> </template>
@@ -23,9 +23,22 @@
 </template>
 <script lang="ts" setup>
   import { Card, List } from 'ant-design-vue';
-  import { dynamicInfoItems } from './data';
+  import { expdatanumberdiffect } from './api';
+ /* import { dynamicInfoItems } from './data';*/
+  import {getDataListApi, getDataListApiyc} from './api';
   import { Icon } from '/@/components/Icon';
-
+  import {ref} from "vue";
   const ListItem = List.Item;
   const ListItemMeta = List.Item.Meta;
+  const dynamicInfoItems= ref([])
+
+  function item03(){
+    expdatanumberdiffect().then(res => {
+      console.log("1919219191919",res)
+       res.forEach(item => {
+        dynamicInfoItems.value.push(item);
+      });
+    })}
+  item03();
+
 </script>
diff --git a/jeecgboot-vue3/src/views/dashboard/workbench/components/ProjectCard.vue b/jeecgboot-vue3/src/views/dashboard/workbench/components/ProjectCard.vue
index 0957031..b081a37 100644
--- a/jeecgboot-vue3/src/views/dashboard/workbench/components/ProjectCard.vue
+++ b/jeecgboot-vue3/src/views/dashboard/workbench/components/ProjectCard.vue
@@ -1,34 +1,79 @@
 <template>
   <Card title="项目" v-bind="$attrs">
-    <template #extra>
-      <a-button type="link" size="small">更多</a-button>
-    </template>
+<!--    <template #extra>-->
+<!--    </template>-->
 
-    <template v-for="item in items" :key="item">
+<!--    <template >-->
       <CardGrid class="!md:w-1/3 !w-full">
         <span class="flex">
-          <Icon :icon="item.icon" :color="item.color" size="30" />
-          <span class="text-lg ml-4">{{ item.title }}</span>
+          <span class="text-lg ml-4">已经注册的专家总数</span>
         </span>
-        <div class="flex mt-2 h-10 text-secondary"> {{ item.desc }} </div>
         <div class="flex justify-between text-secondary">
-          <span>{{ item.group }}</span>
-          <span>{{ item.date }}</span>
+
+          <span style="font-weight: bold; font-size: 2em; margin-left: auto; display: inline-block; width: fit-content;">{{ item1 }}</span>
         </div>
       </CardGrid>
-    </template>
+    <CardGrid class="!md:w-1/3 !w-full">
+        <span class="flex">
+          <span class="text-lg ml-4">状态异常的专家数</span>
+        </span>
+      <div class="flex justify-between text-secondary">
+
+        <span style="font-weight: bold; font-size: 2em; margin-left: auto; display: inline-block; width: fit-content;">{{ item3 }}</span>
+      </div>
+    </CardGrid>
+    <CardGrid class="!md:w-1/3 !w-full">
+        <span class="flex">
+          <span class="text-lg ml-4">状态正常的专家数</span>
+        </span>
+      <div class="flex justify-between text-secondary">
+
+        <span style="font-weight: bold; font-size: 2em; margin-left: auto; display: inline-block; width: fit-content;">{{ item2 }}</span>
+      </div>
+    </CardGrid>
+
+<!--    </template>-->
   </Card>
 </template>
 <script lang="ts">
-  import { defineComponent } from 'vue';
+  import { defineComponent, ref } from 'vue';
   import { Card } from 'ant-design-vue';
   import { Icon } from '/@/components/Icon';
-  import { groupItems } from './data';
-
+  import { getDataListApi,getDataListApizc,getDataListApiyc } from './api';
   export default defineComponent({
     components: { Card, CardGrid: Card.Grid, Icon },
     setup() {
-      return { items: groupItems };
+      const  item1 = ref("0");
+      function item01(){
+        getDataListApi().then(res => {
+          item1.value = res
+          console.log("-----------------",item1.value)
+        })}
+      item01();
+
+      const  item2 = ref("0");
+      function item02(){
+        getDataListApizc().then(res => {
+          item2.value = res
+          console.log("++++++++++++++++++++++",item2.value)
+        })}
+      item02();
+
+      const  item3 = ref("0");
+      function item03(){
+        getDataListApiyc().then(res => {
+          item3.value = res
+          console.log("++++++++++++++++++++++",item3.value)
+        })}
+      item03();
+
+
+      return {item1,item2,item3}
+
+
     },
   });
+
+
+
 </script>
diff --git a/jeecgboot-vue3/src/views/dashboard/workbench/components/QuickNav.vue b/jeecgboot-vue3/src/views/dashboard/workbench/components/QuickNav.vue
index 4e004d1..b5fd7fc 100644
--- a/jeecgboot-vue3/src/views/dashboard/workbench/components/QuickNav.vue
+++ b/jeecgboot-vue3/src/views/dashboard/workbench/components/QuickNav.vue
@@ -1,5 +1,5 @@
 <template>
-  <Card title="快捷导航" v-bind="$attrs">
+<!--  <Card title="快捷导航" v-bind="$attrs">
     <template v-for="item in navItems" :key="item">
       <CardGrid>
         <span class="flex flex-col items-center">
@@ -8,7 +8,7 @@
         </span>
       </CardGrid>
     </template>
-  </Card>
+  </Card>-->
 </template>
 <script lang="ts" setup>
   import { Card } from 'ant-design-vue';
diff --git a/jeecgboot-vue3/src/views/dashboard/workbench/components/SaleRadar.vue b/jeecgboot-vue3/src/views/dashboard/workbench/components/SaleRadar.vue
index d623ea3..dbd8bfd 100644
--- a/jeecgboot-vue3/src/views/dashboard/workbench/components/SaleRadar.vue
+++ b/jeecgboot-vue3/src/views/dashboard/workbench/components/SaleRadar.vue
@@ -1,7 +1,7 @@
 <template>
-  <Card title="销售统计" :loading="loading">
+<!--  <Card title="销售统计" :loading="loading">
     <div ref="chartRef" :style="{ width, height }"></div>
-  </Card>
+  </Card>-->
 </template>
 <script lang="ts" setup>
   import { Ref, ref, watch } from 'vue';
diff --git a/jeecgboot-vue3/src/views/dashboard/workbench/components/WorkbenchHeader.vue b/jeecgboot-vue3/src/views/dashboard/workbench/components/WorkbenchHeader.vue
index 9a75adc..b0eb7cc 100644
--- a/jeecgboot-vue3/src/views/dashboard/workbench/components/WorkbenchHeader.vue
+++ b/jeecgboot-vue3/src/views/dashboard/workbench/components/WorkbenchHeader.vue
@@ -3,22 +3,8 @@
     <Avatar :src="userinfo.avatar || headerImg" :size="72" class="!mx-auto !block" />
     <div class="md:ml-6 flex flex-col justify-center md:mt-0 mt-2">
       <h1 class="md:text-lg text-md">早安, {{ userinfo.realname }}, 开始您一天的工作吧！</h1>
-      <span class="text-secondary"> 今日晴，20℃ - 32℃！ </span>
     </div>
     <div class="flex flex-1 justify-end md:mt-0 mt-4">
-      <div class="flex flex-col justify-center text-right">
-        <span class="text-secondary"> 待办 </span>
-        <span class="text-2xl">2/10</span>
-      </div>
-
-      <div class="flex flex-col justify-center text-right md:mx-16 mx-12">
-        <span class="text-secondary"> 项目 </span>
-        <span class="text-2xl">8</span>
-      </div>
-      <div class="flex flex-col justify-center text-right md:mr-10 mr-4">
-        <span class="text-secondary"> 团队 </span>
-        <span class="text-2xl">300</span>
-      </div>
     </div>
   </div>
 </template>
diff --git a/jeecgboot-vue3/src/views/dashboard/workbench/components/api.ts b/jeecgboot-vue3/src/views/dashboard/workbench/components/api.ts
new file mode 100644
index 0000000..02de0c0
--- /dev/null
+++ b/jeecgboot-vue3/src/views/dashboard/workbench/components/api.ts
@@ -0,0 +1,27 @@
+import { defHttp } from '/src/utils/http/axios';
+import { useMessage } from "/src/hooks/web/useMessage";
+
+const { createConfirm } = useMessage();
+
+enum Api {
+  dataList = '/expert/expert/expdatanumber',
+  zclist = '/expert/expert/expdatanumberzc',
+  lyzjlist = '/expert/expert/expdatanumberdiffect',
+}
+
+export function getDataListApi() {
+  return defHttp.get({ url: Api.dataList });
+}
+
+
+export function getDataListApizc() {
+  return defHttp.get({ url: Api.zclist });
+}
+
+export function getDataListApiyc() {
+  return defHttp.get({ url: Api.yclist });
+}
+
+export function expdatanumberdiffect() {
+  return defHttp.get({ url: Api.lyzjlist });
+}
diff --git a/jeecgboot-vue3/src/views/expert/admin/components/ExpertForm.vue b/jeecgboot-vue3/src/views/expert/admin/components/ExpertForm.vue
index 51a5f87..0d6eb62 100644
--- a/jeecgboot-vue3/src/views/expert/admin/components/ExpertForm.vue
+++ b/jeecgboot-vue3/src/views/expert/admin/components/ExpertForm.vue
@@ -99,10 +99,16 @@
                 <j-switch v-model:value="formData.expsture"  ></j-switch>
               </a-form-item>
             </a-col>
-            <a-col :span="24"  v-if="formData.expsture === 'Y'">
+<!--            <a-col :span="24"  v-if="formData.expsture === 'Y'">
               <a-form-item label="异常备注" v-bind="validateInfos.errinfo" id="ExpertForm-errinfo" name="errinfo">
                 <a-input v-model:value="formData.errinfo" placeholder="请输入异常备注"  allow-clear ></a-input>
               </a-form-item>
+            </a-col>-->
+
+            <a-col :span="24"  v-if="formData.expsture === 'Y'">
+              <a-form-item label="异常备注" v-bind="validateInfos.errinfo" id="ExpertForm-errinfo" name="errinfo">
+                <j-dict-select-tag v-model:value="formData.errinfo" dictCode="yczt" placeholder="请选择异常备注"  allow-clear />
+              </a-form-item>
             </a-col>
 
             <a-col :span="24"  v-if="formData.adminopen === '3' || formData.compopen === '3'">
@@ -161,6 +167,7 @@ import JImageUpload from '/src/components/Form/src/jeecg/components/JImageUpload
     adminopen: '',
     backinfo: '',
     zc: '',
+    expsture: '',
   });
   const { createMessage } = useMessage();
   const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });
diff --git a/jeecgboot-vue3/src/views/expert/adminback/components/ExpertForm.vue b/jeecgboot-vue3/src/views/expert/adminback/components/ExpertForm.vue
index 286139e..b21ed9a 100644
--- a/jeecgboot-vue3/src/views/expert/adminback/components/ExpertForm.vue
+++ b/jeecgboot-vue3/src/views/expert/adminback/components/ExpertForm.vue
@@ -11,10 +11,16 @@
                 <j-switch v-model:value="formData.expsture"  ></j-switch>
               </a-form-item>
             </a-col>
-            <a-col :span="24"  v-if="formData.expsture === 'Y'">
+<!--            <a-col :span="24"  v-if="formData.expsture === 'Y'">
               <a-form-item label="异常备注" v-bind="validateInfos.errinfo" id="ExpertForm-errinfo" name="errinfo">
                 <a-input v-model:value="formData.errinfo" placeholder="请输入异常备注"  allow-clear ></a-input>
               </a-form-item>
+            </a-col>-->
+
+            <a-col :span="24"  v-if="formData.expsture === 'Y'">
+              <a-form-item label="异常备注" v-bind="validateInfos.errinfo" id="ExpertForm-errinfo" name="errinfo">
+                <j-dict-select-tag v-model:value="formData.errinfo" dictCode="yczt" placeholder="请选择异常备注"  allow-clear />
+              </a-form-item>
             </a-col>
 
             <a-col :span="24"  v-if="formData.adminopen === '3' || formData.compopen === '3'">
@@ -72,6 +78,8 @@ import JImageUpload from '/src/components/Form/src/jeecg/components/JImageUpload
     compopen: '',
     adminopen: '',
     backinfo: '',
+    zc: '',
+    expsture: '',
   });
   const { createMessage } = useMessage();
   const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });
diff --git a/jeecgboot-vue3/src/views/expert/county/components/ExpertForm.vue b/jeecgboot-vue3/src/views/expert/county/components/ExpertForm.vue
index 61674d1..453776c 100644
--- a/jeecgboot-vue3/src/views/expert/county/components/ExpertForm.vue
+++ b/jeecgboot-vue3/src/views/expert/county/components/ExpertForm.vue
@@ -99,10 +99,16 @@
                 <j-switch v-model:value="formData.expsture"  ></j-switch>
               </a-form-item>
             </a-col>
-            <a-col :span="24"  v-if="formData.expsture === 'Y'">
+<!--            <a-col :span="24"  v-if="formData.expsture === 'Y'">
               <a-form-item label="异常备注" v-bind="validateInfos.errinfo" id="ExpertForm-errinfo" name="errinfo">
                 <a-input v-model:value="formData.errinfo" placeholder="请输入异常备注"  allow-clear ></a-input>
               </a-form-item>
+            </a-col>-->
+
+            <a-col :span="24"  v-if="formData.expsture === 'Y'">
+              <a-form-item label="异常备注" v-bind="validateInfos.errinfo" id="ExpertForm-errinfo" name="errinfo">
+                <j-dict-select-tag v-model:value="formData.errinfo" dictCode="yczt" placeholder="请选择异常备注"  allow-clear />
+              </a-form-item>
             </a-col>
 
             <a-col :span="24"  v-if="formData.adminopen === '3' || formData.compopen === '3'">
@@ -161,6 +167,7 @@ import JImageUpload from '/src/components/Form/src/jeecg/components/JImageUpload
     errinfo: '',
     expsture: '',
       backinfo: '',
+    zc: '',
   });
   const { createMessage } = useMessage();
   const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });
diff --git a/jeecgboot-vue3/src/views/expert/firm/components/ExpertForm.vue b/jeecgboot-vue3/src/views/expert/firm/components/ExpertForm.vue
index 094e242..cb20ef8 100644
--- a/jeecgboot-vue3/src/views/expert/firm/components/ExpertForm.vue
+++ b/jeecgboot-vue3/src/views/expert/firm/components/ExpertForm.vue
@@ -96,9 +96,9 @@
 						</a-col>
 
 
-            <a-col :span="24"  v-if="formData.adminopen === '3' || formData.compopen === '3'">
-              <a-form-item label="异常备注" v-bind="validateInfos.errinfo" id="ExpertForm-backinfo" name="backinfo">
-                <a-input v-model:value="formData.backinfo" placeholder="请输入异常备注"  allow-clear ></a-input>
+            <a-col :span="24"  v-if="formData.expsture === 'Y'">
+              <a-form-item label="异常备注" v-bind="validateInfos.errinfo" id="ExpertForm-errinfo" name="errinfo">
+                <j-dict-select-tag v-model:value="formData.errinfo" dictCode="yczt" placeholder="请选择异常备注"  allow-clear />
               </a-form-item>
             </a-col>
 
@@ -149,7 +149,9 @@ import JImageUpload from '/src/components/Form/src/jeecg/components/JImageUpload
     expinfo: '',
     compopen: '',
     adminopen: '',
-      backinfo: '',
+    backinfo: '',
+    expsture: '',
+    zc: '',
   });
   const { createMessage } = useMessage();
   const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });
diff --git a/jeecgboot-vue3/src/views/expert/self/components/ExpertForm.vue b/jeecgboot-vue3/src/views/expert/self/components/ExpertForm.vue
index e3ce5d1..30f10f5 100644
--- a/jeecgboot-vue3/src/views/expert/self/components/ExpertForm.vue
+++ b/jeecgboot-vue3/src/views/expert/self/components/ExpertForm.vue
@@ -93,9 +93,9 @@
               </a-form-item>
 						</a-col>
 
-            <a-col :span="24"  v-if="formData.adminopen === '3' || formData.compopen === '3'">
-              <a-form-item label="异常备注" v-bind="validateInfos.errinfo" id="ExpertForm-backinfo" name="backinfo">
-                <a-input v-model:value="formData.backinfo" placeholder="请输入异常备注"  allow-clear ></a-input>
+            <a-col :span="24"  v-if="formData.expsture === 'Y'">
+              <a-form-item label="异常备注" v-bind="validateInfos.errinfo" id="ExpertForm-errinfo" name="errinfo">
+                <j-dict-select-tag v-model:value="formData.errinfo" dictCode="yczt" placeholder="请选择异常备注"  allow-clear />
               </a-form-item>
             </a-col>
 
@@ -148,6 +148,8 @@ import JImageUpload from '/src/components/Form/src/jeecg/components/JImageUpload
     compopen: '',
     adminopen: '',
       backinfo: '',
+    expsture: '',
+    zc: '',
   });
   const { createMessage } = useMessage();
   const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });

From 3f4c923f4333588957feb1321958b1a75866fce7 Mon Sep 17 00:00:00 2001
From: Gitea <gitea@fake.local>
Date: Fri, 8 Nov 2024 16:22:29 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BB=AA=E5=99=A8=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../demo/instrument/controller/InstrumentController.java   | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/instrument/controller/InstrumentController.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/instrument/controller/InstrumentController.java
index d17a510..7ddfd6b 100644
--- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/instrument/controller/InstrumentController.java
+++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/instrument/controller/InstrumentController.java
@@ -27,6 +27,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 
+import org.jeecg.modules.system.entity.SysDepart;
 import org.jeecg.modules.system.service.ISysDepartService;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
@@ -194,6 +195,12 @@ public class InstrumentController extends JeecgController<Instrument, IInstrumen
 		 	//县区管理员角色
 			 queryWrapper.in("state",1,2,3);
 			 queryWrapper.in("flag",1,2);
+			 QueryWrapper<SysDepart> queryWrappersd = new QueryWrapper();
+			 queryWrappersd.eq("del_flag", 0);
+			 queryWrappersd.eq("parent_id", loginUser.getOrgId());
+			 List<SysDepart> listsd = sysDepartService.list(queryWrappersd);
+			 List<String> ids = listsd.stream().map(SysDepart::getId).collect(Collectors.toList());
+			 queryWrapper.in("declaration_unit",ids);
 			 Page<Instrument> page = new Page<Instrument>(pageNo, pageSize);
 			 IPage<Instrument> pageList = instrumentService.page(page, queryWrapper);
 			 return Result.OK(pageList);