优化

src/components/bpmnProcessDesigner/package/penal/multi-instance/ElementMultiInstance.vue

@@ -64,7 +64,9 @@ export default {
         asyncBefore: false,
         exclusive: false
       },
-      loopInstanceForm: {}
+      loopInstanceForm: {
+        completionCondition:''
+      }
     };
   },
   watch: {
@@ -112,12 +114,19 @@ export default {
       }
     },
     changeLoopCharacteristicsType(type) {
+      this.loopInstanceForm.completionCondition = ''
       // this.loopInstanceForm = { ...this.defaultLoopInstanceForm }; // 切换类型取消原表单配置
       // 取消多实例配置
       if (type === "Null") {
         window.bpmnInstances.modeling.updateProperties(this.bpmnElement, { loopCharacteristics: null });
         return;
       }
+      // 并行
+      if (type === "ParallelMultiInstance") {
+        this.loopInstanceForm.completionCondition = '${ nrOfCompletedInstances == 1 }'
+        this.updateLoopCondition(this.loopInstanceForm.completionCondition)
+        return;
+      }
       // 配置循环
       if (type === "StandardLoop") {
         const loopCharacteristicsObject = window.bpmnInstances.moddle.create("bpmn:StandardLoopCharacteristics");

src/views/system/organization/components/org-user-edit.vue

@@ -1594,7 +1594,7 @@ export default {
           delete data.id;
         }
         if (!Array.isArray(data.signature)) {
-          data.signature = [data.signature];
+          data.signature = [data.signature].filter(item=>Boolean(item) && Object.keys(item).length!==0);
         }
         saveOrUpdateUser(data)
           .then((msg) => {