commit

src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/controller/ExecutiveCommitteeUnionPushController.java

@@ -270,7 +270,6 @@ public class ExecutiveCommitteeUnionPushController {
             // 自动完成第一个申请任务
             List<ProcessTask> doingTaskList = flowEngine.processTaskService().getDoingTaskList(instance.getId(), null);
             for (ProcessTask task : doingTaskList) {
-                args.put(FlowConst.NEXT_NODE_OPERATOR, ExecutiveCommitteeUnionPushInfo.getUserId());
                 flowEngine.executeProcessTask(task.getId(), SecurityUtil.getUserId(), args);
             }
         });

src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/models/ExecutiveCommitteeTwoPush.java

@@ -66,4 +66,15 @@ public class ExecutiveCommitteeTwoPush extends BaseModel implements Serializable
     @Comment("推选时间")
     @ColDefine(type = ColType.DATETIME)
     private DateTime pushDate;
+
+    @Column
+    @Comment("录入类型1.执委会委员/2.工会委员会委员/3.经审委员会委员")
+    @ColDefine(type = ColType.VARCHAR,width = 30)
+    private String roleCode;
+
+    @Column
+    @Comment("是否正式委员")
+    @Default("0")
+    @ColDefine(type = ColType.BOOLEAN)
+    private Boolean isFormal;
 }