From 04cf849507f293973226f871026c1aa590e82225 Mon Sep 17 00:00:00 2001
From: wx-jincw <jin.chenwei@iwhalecloud.com>
Date: Sat, 27 Dec 2025 17:55:25 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=B5=81=E7=A8=8B=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/src/api/system/role.js                    |  0
 admin/src/api/system/user.js                    |  5 +++++
 .../penal/task/task-components/UserTask.vue     | 17 ++++++++++-------
 admin/src/views/workflow/work/detail.vue        |  9 +++++----
 4 files changed, 20 insertions(+), 11 deletions(-)
 delete mode 100644 admin/src/api/system/role.js

diff --git a/admin/src/api/system/role.js b/admin/src/api/system/role.js
deleted file mode 100644
index e69de29..0000000
diff --git a/admin/src/api/system/user.js b/admin/src/api/system/user.js
index e69de29..adf057f 100644
--- a/admin/src/api/system/user.js
+++ b/admin/src/api/system/user.js
@@ -0,0 +1,5 @@
+
+
+function deptTreeSelect() {
+  
+}
\ No newline at end of file
diff --git a/admin/src/plugins/package/penal/task/task-components/UserTask.vue b/admin/src/plugins/package/penal/task/task-components/UserTask.vue
index a059589..fbd16bc 100644
--- a/admin/src/plugins/package/penal/task/task-components/UserTask.vue
+++ b/admin/src/plugins/package/penal/task/task-components/UserTask.vue
@@ -120,8 +120,10 @@
 </template>
 
 <script>
-import { listUser, deptTreeSelect } from "@/api/system/user";
-import { listRole } from "@/api/system/role";
+import { deptTreeSelect } from "@/api/system/user";
+// import { listRole } from "@/api/system/role";
+import { adminList as listUser, } from "@/api/systemadmin";
+import { getRoleList as listRole } from "@/api/role";
 import TreeSelect from "@/components/TreeSelect";
 
 const userTaskForm = {
@@ -250,11 +252,12 @@ export default {
     getDeptOptions() {
       return new Promise((resolve, reject) => {
         if (!this.deptOptions || this.deptOptions.length <= 0) {
-          deptTreeSelect().then(response => {
-            this.deptTempOptions = response.data;
-            this.deptOptions = response.data;
-            resolve()
-          })
+          // deptTreeSelect().then(response => {
+          //   this.deptTempOptions = response.data;
+          //   this.deptOptions = response.data;
+          //   resolve()
+          // })
+          reject()
         } else {
           reject()
         }
diff --git a/admin/src/views/workflow/work/detail.vue b/admin/src/views/workflow/work/detail.vue
index 43c5ca2..1122dbd 100644
--- a/admin/src/views/workflow/work/detail.vue
+++ b/admin/src/views/workflow/work/detail.vue
@@ -208,6 +208,7 @@ import { detailProcess } from '@/api/workflow/process'
 import Parser from '@/utils/generator/parser'
 import { complete, delegate, transfer, rejectTask, returnList, returnTask } from '@/api/workflow/task'
 import { selectUser, deptTreeSelect } from '@/api/system/user'
+import { adminList } from "@/api/systemadmin";
 import ProcessViewer from '@/components/ProcessViewer'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 import Treeselect from '@riophae/vue-treeselect'
@@ -330,14 +331,14 @@ export default {
     },
     /** 查询部门下拉树结构 */
     getTreeSelect() {
-      deptTreeSelect().then(response => {
-        this.deptOptions = response.data;
-      });
+      // deptTreeSelect().then(response => {
+      //   this.deptOptions = response.data;
+      // });
     },
     /** 查询用户列表 */
     getList() {
       this.userLoading = true;
-      selectUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+      adminList(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
         this.userList = response.rows;
         this.total = response.total;
         this.toggleSelection(this.userMultipleSelection);