Merge remote-tracking branch 'core/dev' into dev

src/ibiz-core/service/entity-service-base.ts

@@ -716,10 +716,11 @@ export class EntityServiceBase {
         try {
             let res: any;
             if (wfdata && Object.keys(wfdata).length !== 0) {
-                const _data: any = { ...{ activedata: data }, wfdata };
+                const _data: any = { ...{ activedata: data }, ...wfdata };
                 res = await this.http.post(`/wfcore/${this.systemName}-app-${this.appName}/${this.dePath}/${data[this.key]}/tasks/${wfdata['taskId']}`, _data);
+            } else {
+                res = await this.http.post(`/${this.dePath}/${context[this.key]}/wfsubmit`, data);
             }
-            res = await this.http.post(`/${this.dePath}/${context[this.key]}/wfsubmit`, data);
             return res;
         } catch (res) {
             return new HttpResponse(res.status, null);