From fe3907e95b1ac70576f9ab9c394eb38f32489333 Mon Sep 17 00:00:00 2001
From: hewenqiang <1527468660@qq.com>
Date: Fri, 28 Jan 2022 15:04:25 +0800
Subject: [PATCH] =?UTF-8?q?fix=20--=20=E6=B5=81=E7=A8=8B=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0=E7=94=A8=E6=88=B7=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E7=9A=84=E5=80=99=E9=80=89=E4=BA=BA=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/FlowTaskServiceImpl.java     |  2 +-
 .../penal/task/task-components/UserTask.vue   | 63 ++++++++++++-------
 2 files changed, 43 insertions(+), 22 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/FlowTaskServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/FlowTaskServiceImpl.java
index f7a2f51f..82282257 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/FlowTaskServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/FlowTaskServiceImpl.java
@@ -571,7 +571,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
         TaskQuery taskQuery = taskService.createTaskQuery()
             .active()
             .includeProcessVariables()
-            .taskAssignee(userId.toString())
+            .taskCandidateOrAssigned(userId.toString())
             .orderByTaskCreateTime().desc();
         page.setTotal(taskQuery.count());
         List<Task> taskList = taskQuery.listPage(pageNum - 1, pageSize);
diff --git a/ruoyi-ui/src/plugins/package/penal/task/task-components/UserTask.vue b/ruoyi-ui/src/plugins/package/penal/task/task-components/UserTask.vue
index 05e24598..193946d3 100644
--- a/ruoyi-ui/src/plugins/package/penal/task/task-components/UserTask.vue
+++ b/ruoyi-ui/src/plugins/package/penal/task/task-components/UserTask.vue
@@ -1,10 +1,9 @@
 <template>
   <div style="margin-top: 16px">
     <el-form-item label="候选类型">
-<!--      <el-select v-model="formData.groupType" placeholder="请选择分组类型" @change="onGroupTypeChange">-->
-      <el-select v-model="formData.groupType" placeholder="请选择分组类型">
+      <el-select v-model="formData.groupType" placeholder="请选择分组类型" @change="onGroupTypeChange">
         <el-option label="固定用户" value="ASSIGNEE" />
-<!--        <el-option label="候选用户" value="USERS" />-->
+        <el-option label="候选用户" value="USERS" />
 <!--        <el-option label="候选组" value="ROLE" />-->
       </el-select>
     </el-form-item>
@@ -177,16 +176,16 @@ export default {
         this.$nextTick(() => this.resetTaskForm());
       }
     },
-    'userTaskForm.assignee': {
-      handler () {
-        this.updateElementTask('assignee');
-      }
-    },
-    'userTaskForm.candidateUsers': {
-      handler () {
-        this.updateElementTask('candidateUsers');
-      }
-    },
+    // 'userTaskForm.assignee': {
+    //   handler () {
+    //     this.updateElementTask('assignee');
+    //   }
+    // },
+    // 'userTaskForm.candidateUsers': {
+    //   handler () {
+    //     this.updateElementTask('candidateUsers');
+    //   }
+    // },
   },
   created() {
     listUser().then(response => {
@@ -196,13 +195,27 @@ export default {
   methods: {
     resetTaskForm() {
       for (let key in this.defaultTaskForm) {
-        if (key === "candidateUsers" || key === "candidateGroups") {
-          let val = this.bpmnElement?.businessObject[key] ? this.bpmnElement.businessObject[key].split(",") : [];
-          // TODO 2022/01/10 添加候选组的设值 this.$set(this.userTaskForm, key, value);
+        if (key === "candidateUsers") {
+          const val = this.bpmnElement?.businessObject[key] ? this.bpmnElement.businessObject[key].split(",") : [];
+          if (val && val.length > 0) {
+            this.formData.groupType = 'USERS';
+            let users = [];
+            // TODO 2022/01/28 优化用户信息获取方式
+            val.forEach(k => {
+              getUser(k).then(response => {
+                let user = response.data.user
+                users.push(user)
+              })
+            })
+            this.$set(this.userTaskForm, key, users);
+          }
+        } else if (key === "candidateGroups") {
+          // TODO 2022/01/28 添加候选组的设值 this.$set(this.userTaskForm, key, value);
         } else if (key === "assignee") {
           let val = this.bpmnElement?.businessObject[key] || this.defaultTaskForm[key];
           // 判断是否为动态用户
           if (val && val.startsWith('${') && val.endsWith('}')) {
+            this.formData.groupType = 'ASSIGNEE';
             this.formData.assignType = '2';
             this.$set(this.userTaskForm, key, val);
           } else {
@@ -219,12 +232,14 @@ export default {
       const taskAttr = Object.create(null);
       if (key === "candidateUsers" || key === "candidateGroups") {
         if (this.userTaskForm[key] && this.userTaskForm[key].length > 0) {
-          // TODO 2022/01/10 添加候选组的设值
-          // taskAttr[key] = this.userTaskForm[key]
+          taskAttr['assignee'] = null;
+          taskAttr[key] = this.userTaskForm[key].map(k => k.userId) || null
         }
+        // TODO 2022/01/10 添加候选组的设值
         // taskAttr[key] = this.userTaskForm[key] && this.userTaskForm[key].length ? this.userTaskForm[key].join() : null;
       } else {
         if (this.userTaskForm[key]) {
+          taskAttr['candidateUsers'] = null;
           if (this.formData.assignType === '1') {
             taskAttr[key] = this.userTaskForm[key].userId || null;
           } else if (this.formData.assignType === '2') {
@@ -277,18 +292,24 @@ export default {
         if (this.formData.groupType === 'ASSIGNEE') {
           val = this.selectedUserDate[0];
           this.userTaskForm.assignee = val;
-          // this.updateElementTask('assignee')
+          this.updateElementTask('assignee')
         } else {
           val = this.selectedUserDate;
           this.userTaskForm.candidateUsers = val;
-          // this.updateElementTask('candidateUsers')
+          this.updateElementTask('candidateUsers')
         }
 
       }
       this.candidateVisible = false;
     },
+    onGroupTypeChange(val) {
+      this.userTaskForm = {}
+      if (val === 'ASSIGNEE') {
+        this.formData.assignType = '1'
+      }
+    },
     onSelectAssignee() {
-      this.getDeptTreeSelect()
+      this.getDeptTreeSelect();
       this.candidateVisible = true;
     }
   },