From 1b8a2ebe513e3fe5b217d12b236274c8ea66df69 Mon Sep 17 00:00:00 2001
From: lyh2668 <6520076+lyh2668@user.noreply.gitee.com>
Date: Wed, 6 Apr 2022 17:28:58 +0000
Subject: [PATCH] =?UTF-8?q?!18=20=E4=BF=AE=E5=A4=8DUserTask=E5=9C=A8?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2=E5=80=99=E9=80=89=E4=BA=BA=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8CXML=E4=BB=8D=E7=84=B6=E4=BF=9D=E7=95=99?=
 =?UTF-8?q?=E4=BC=9A=E4=BF=9D=E7=95=99=E5=8F=A6=E4=B8=80=E7=A7=8D=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E4=BF=A1=E6=81=AF=E7=9A=84=E9=97=AE=E9=A2=98=20*=20fe?=
 =?UTF-8?q?at:=20=E4=BF=AE=E5=A4=8DUserTask=E5=9C=A8=E5=88=87=E6=8D=A2?=
 =?UTF-8?q?=E5=80=99=E9=80=89=E4=BA=BA=E7=B1=BB=E5=9E=8B=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?XML=E4=BB=8D=E7=84=B6=E4=BF=9D=E7=95=99=E4=BC=9A=E4=BF=9D?=
 =?UTF-8?q?=E7=95=99=E5=8F=A6=E4=B8=80=E7=A7=8D=E7=B1=BB=E5=9E=8B=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=8C=E5=AF=BC=E8=87=B4?=
 =?UTF-8?q?=E4=BB=A3=E5=8A=9E=E4=BB=BB=E5=8A=A1=E6=97=A0=E6=B3=95=E6=AD=A3?=
 =?UTF-8?q?=E7=A1=AE=E5=8C=B9=E9=85=8D=E5=88=B0=E5=BD=93=E5=89=8D=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=E4=BA=BA=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../package/penal/task/task-components/UserTask.vue  | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

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 09be68e3..7edb0879 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
@@ -108,7 +108,7 @@
 <!--                    placeholder="请输入处理意见"-->
 <!--          />-->
 <!--          <el-button @click="completeOpen = false">取 消</el-button>-->
-        </div>
+      </div>
     </el-dialog>
   </div>
 
@@ -228,6 +228,11 @@ export default {
     updateElementTask(key) {
       const taskAttr = Object.create(null);
       taskAttr['flowable:assignType'] = this.formData.assignType;
+      // 修复切换候选类型XML仍保留assignee的问题
+      if ((key === 'candidateUsers' || key === 'assignee') && !this.userTaskForm[key]) {
+        taskAttr[key] = null
+      }
+
       if (key === "candidateUsers" || key === "candidateGroups") {
         if (this.userTaskForm[key] && this.userTaskForm[key].length > 0) {
           taskAttr[key] = this.userTaskForm[key].map(k => k.userId) || null
@@ -302,13 +307,12 @@ export default {
         if (this.formData.groupType === 'ASSIGNEE') {
           val = this.selectedUserDate[0];
           this.userTaskForm.assignee = val;
-          this.updateElementTask('assignee')
         } else {
           val = this.selectedUserDate;
           this.userTaskForm.candidateUsers = val;
-          this.updateElementTask('candidateUsers')
         }
-
+        this.updateElementTask('assignee')
+        this.updateElementTask('candidateUsers')
       }
       this.candidateVisible = false;
     },