修改bug

modules/ibizlab-generator-core/src/main/java/cn/ibizlab/codegen/model/WorkflowModel.java

@@ -45,7 +45,7 @@ public class WorkflowModel extends BaseModel{
         if(refGroups==null)
         {
             refGroups=new LinkedHashMap<>();
-            if(ObjectUtils.isEmpty(getWFVer().getPSWFProcesses()))
+            if(!ObjectUtils.isEmpty(getWFVer().getPSWFProcesses()))
             {
                 getWFVer().getPSWFProcesses().forEach(WFProcess->{
                     List<IPSWFProcessRole> roles=null;
@@ -78,20 +78,24 @@ public class WorkflowModel extends BaseModel{
     private Map<String,EntityModel> bookings;
     public Map<String,EntityModel> getBookings()
     {
-        if(bookings==null)
+        if(getWFVer().getPSWorkflow()!=null&&getWFVer().getPSWorkflow().getPSWFDEs()!=null)
         {
-            bookings=new LinkedHashMap<>();
-            getWFVer().getPSWorkflow().getPSWFDEs().forEach(de->{
-                bookings.put(de.getCodeName(),getSystem().getEntity(de.getCodeName()));
-            });
+            if(bookings==null)
+            {
+                bookings=new LinkedHashMap<>();
+                getWFVer().getPSWorkflow().getPSWFDEs().forEach(de->{
+                    bookings.put(de.getCodeName(),getSystem().getEntity(de.getCodeName()));
+                });
+            }
         }
+
         return bookings;
     }
 
 
     private Map<String,Map<String,AppModel>> mobApps;
     public Map<String,Map<String,AppModel>> getMobApps() {
-        if (mobApps == null) {
+        if (mobApps == null&&getBookings()!=null) {
             mobApps=new LinkedHashMap<>();
             getBookings().keySet().forEach(entity->{
                 if(ObjectUtils.isEmpty(getSystem().getApps()))
@@ -125,7 +129,7 @@ public class WorkflowModel extends BaseModel{
 
     private Map<String,Map<String,AppModel>> webApps;
     public Map<String,Map<String,AppModel>> getWebApps() {
-        if (webApps == null) {
+        if (webApps == null&&getBookings()!=null) {
             webApps=new LinkedHashMap<>();
             getBookings().keySet().forEach(entity->{
                 if(ObjectUtils.isEmpty(getSystem().getApps()))

modules/ibizlab-generator-core/src/main/resources/templ/r7/{{projectName}}-core/src/main/resources/workflow/{{workflows}}.bpmn.hbs

@@ -28,7 +28,7 @@
             {{/each}}
             {{/if}}
 
-            {{#each item.psWorkflow().psWFDEs as |wfde|}}
+            {{#each workflow.psWorkflow.psWFDEs as |wfde|}}
             {{#if wfde.wFStepPSDEField}}
             <flowable:field name="wfstepfield_{{pluralize wfde.psDataEntity.codeName}}">
                 <flowable:string>{{lowerCase wfde.wFStepPSDEField.codeName}}</flowable:string>