From 40fcf5ced21bc1fb9812a9ecf4e3cf564af51395 Mon Sep 17 00:00:00 2001
From: tony <846249920@qq.com>
Date: Fri, 6 Jan 2023 14:05:50 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=A4=84=E7=90=86=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E5=88=87=E6=8D=A2=E7=94=A8=E6=88=B7=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E6=97=B6=E6=9C=AA=E6=B8=85=E7=A9=BA=E5=B7=B2=E9=80=89?=
 =?UTF-8?q?=E4=B8=AD=E5=80=BC=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/Process/components/nodePanel/task.vue | 9 ++++-----
 ruoyi-ui/src/components/flow/Role/index.vue              | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/ruoyi-ui/src/components/Process/components/nodePanel/task.vue b/ruoyi-ui/src/components/Process/components/nodePanel/task.vue
index 83f3d542..70bc0db5 100644
--- a/ruoyi-ui/src/components/Process/components/nodePanel/task.vue
+++ b/ruoyi-ui/src/components/Process/components/nodePanel/task.vue
@@ -357,12 +357,11 @@ export default {
   },
   watch: {
     'formData.userType': function(val, oldVal) {
-      const types = ['assignee', 'candidateUsers', 'candidateGroups']
       if (StrUtil.isNotBlank(oldVal)) {
-        types.forEach(type => {
-          delete this.element.businessObject.$attrs[`flowable:${type}`]
-          delete this.formData[type]
-        })
+          delete this.element.businessObject.$attrs[`flowable:${oldVal}`]
+          delete this.formData[oldVal]
+          // 清除已选人员数据
+          this.checkValues = '';
       }
       // 写入userType节点信息到xml
       this.updateProperties({'flowable:userType': val})
diff --git a/ruoyi-ui/src/components/flow/Role/index.vue b/ruoyi-ui/src/components/flow/Role/index.vue
index 8fb72fc3..7a74b899 100644
--- a/ruoyi-ui/src/components/flow/Role/index.vue
+++ b/ruoyi-ui/src/components/flow/Role/index.vue
@@ -115,7 +115,7 @@ export default {
   watch: {
     selectValues: {
       handler(newVal) {
-        if (newVal instanceof Number) {
+        if (newVal instanceof Number || newVal instanceof String) {
           this.radioSelected = newVal
         } else {
           this.selectRoleList = newVal;