From d1c381bdd28178776c5e965be603c52b63b19ad5 Mon Sep 17 00:00:00 2001
From: wx-jincw <jin.chenwei@iwhalecloud.com>
Date: Mon, 29 Dec 2025 23:17:38 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=92=E8=89=B2=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E5=AF=B9=E9=BD=90=EF=BC=8C=E9=83=A8=E9=97=A8=E6=A0=91=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/src/api/dept.js                         |  9 +++++++
 admin/src/api/system/user.js                  |  5 ----
 .../penal/task/task-components/UserTask.vue   | 27 +++++++++----------
 admin/src/views/workflow/work/detail.vue      |  8 +++---
 4 files changed, 26 insertions(+), 23 deletions(-)
 create mode 100644 admin/src/api/dept.js
 delete mode 100644 admin/src/api/system/user.js

diff --git a/admin/src/api/dept.js b/admin/src/api/dept.js
new file mode 100644
index 0000000..bf15361
--- /dev/null
+++ b/admin/src/api/dept.js
@@ -0,0 +1,9 @@
+import request from '@/utils/request'
+
+// 查询部门树
+export function deptTreeSelect() {
+  return request({
+    url: '/autogencode/sysdept/tree',
+    method: 'get'
+  })
+}
diff --git a/admin/src/api/system/user.js b/admin/src/api/system/user.js
deleted file mode 100644
index adf057f..0000000
--- a/admin/src/api/system/user.js
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-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 fbd16bc..98b9175 100644
--- a/admin/src/plugins/package/penal/task/task-components/UserTask.vue
+++ b/admin/src/plugins/package/penal/task/task-components/UserTask.vue
@@ -22,9 +22,9 @@
         <el-select v-model="roleIds" multiple size="mini" placeholder="请选择 角色" @change="changeSelectRoles">
           <el-option
             v-for="item in roleOptions"
-            :key="item.roleId"
+            :key="item.id"
             :label="item.roleName"
-            :value="`ROLE${item.roleId}`"
+            :value="`ROLE${item.id}`"
             :disabled="item.status === 1">
           </el-option>
         </el-select>
@@ -120,7 +120,7 @@
 </template>
 
 <script>
-import { deptTreeSelect } from "@/api/system/user";
+import { deptTreeSelect } from "@/api/dept";
 // import { listRole } from "@/api/system/role";
 import { adminList as listUser, } from "@/api/systemadmin";
 import { getRoleList as listRole } from "@/api/role";
@@ -252,12 +252,11 @@ 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()
-          // })
-          reject()
+          deptTreeSelect().then(response => {
+            this.deptTempOptions = response;
+            this.deptOptions = response;
+            resolve()
+          })
         } else {
           reject()
         }
@@ -294,13 +293,13 @@ export default {
      */
     getRoleOptions() {
       if (!this.roleOptions || this.roleOptions.length <= 0) {
-        listRole().then(response => this.roleOptions = response.rows);
+        listRole({}).then(response => this.roleOptions = response.list);
       }
     },
     /** 查询用户列表 */
     getUserList() {
-      listUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
-        this.userTableList = response.rows;
+      listUser(this.addDateRange(this.queryParams, this.dateRange).params).then(response => {
+        this.userTableList = response.list;
         this.userTotal = response.total;
       });
     },
@@ -359,7 +358,7 @@ export default {
       if (val && val.length > 0) {
         userTaskForm.dataType = 'ROLES';
         groups = val.join() || null;
-        let textArr = this.roleOptions.filter(k => val.indexOf(`ROLE${k.roleId}`) >= 0);
+        let textArr = this.roleOptions.filter(k => val.indexOf(`ROLE${k.id}`) >= 0);
         text = textArr?.map(k => k.roleName).join() || null;
       } else {
         userTaskForm.dataType = null;
@@ -426,7 +425,7 @@ export default {
         this.getRoleOptions();
         if (this.roleIds && this.roleIds.length > 0) {
           userTaskForm.candidateGroups = this.roleIds.join() || null;
-          let textArr = this.roleOptions.filter(k => this.roleIds.indexOf(`ROLE${k.roleId}`) >= 0);
+          let textArr = this.roleOptions.filter(k => this.roleIds.indexOf(`ROLE${k.id}`) >= 0);
           userTaskForm.text = textArr?.map(k => k.roleName).join() || null;
         }
       } else if (val === 'DEPTS') {
diff --git a/admin/src/views/workflow/work/detail.vue b/admin/src/views/workflow/work/detail.vue
index ceaadc6..d9c5879 100644
--- a/admin/src/views/workflow/work/detail.vue
+++ b/admin/src/views/workflow/work/detail.vue
@@ -207,7 +207,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 { deptTreeSelect } from '@/api/dept'
 import { adminList } from "@/api/systemadmin";
 import ProcessViewer from '@/components/ProcessViewer'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
@@ -331,9 +331,9 @@ export default {
     },
     /** 查询部门下拉树结构 */
     getTreeSelect() {
-      // deptTreeSelect().then(response => {
-      //   this.deptOptions = response.data;
-      // });
+      deptTreeSelect().then(response => {
+        this.deptOptions = response;
+      });
     },
     /** 查询用户列表 */
     getList() {