formVariables 业务参数集合 不能为空！

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java

@@ -591,6 +591,7 @@ public class BaseVehmodelConfigService extends MybatisBaseService<BaseVehmodelCo
             qw.like("bmc.configName", query.getConfigName());
         }
         qw.eq("bvm.isDelete",0);
+        qw.eq("bmc.isDelete",0);
         IPage<BaseVehmodelConfig> page = PagerUtil.queryToPage(pq);
         IPage<BaseVehmodelConfigVos> pagging = baseMapper.selVehModelByUseOrgSidAndModelSidAndConfigSid(page, qw);
         PagerVo<BaseVehmodelConfigVos> p = PagerUtil.pageToVo(pagging, null);

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/FlowableFallback.java

@@ -47,10 +47,6 @@ public class FlowableFallback implements FlowableFeign{
         return null;
     }
 
-    @Override
-    public ResultBean complete(Map<String, Object> variables) {
-        return null;
-    }
 
     @Override
     public ResultBean revokeProcess(String userSid, String businessSid, FlowTaskVo flowTaskVo) {
@@ -67,11 +63,6 @@ public class FlowableFallback implements FlowableFeign{
         return null;
     }
 
-    @Override
-    public ResultBean breakProcess(String businessSid, FlowTaskVo flowTaskVo) {
-        return null;
-    }
-
     @Override
     public ResultBean stopProcess(FlowTaskVo flowTaskVo) {
         return null;

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/FlowableFeign.java

@@ -96,10 +96,10 @@ public interface FlowableFeign {
      * @param variables 表单参数
      * @return
      */
-    @ApiOperation(value = "办理（同意）")
+   /* @ApiOperation(value = "办理（同意）")
     @PostMapping("/complete")
     public ResultBean complete(@ApiParam(value = "变量集合,json对象") @RequestBody Map<String, Object> variables);
-
+*/
     /**
      * 流程撤回
      *
@@ -137,11 +137,11 @@ public interface FlowableFeign {
     public ResultBean taskReject(@ApiParam(value = "业务sid") @PathVariable(value = "businessSid") String businessSid,
                                  @ApiParam(value = "工作流任务相关--请求参数") @RequestBody FlowTaskVo flowTaskVo);
 
-    @ApiOperation(value = "终止任务")
+   /* @ApiOperation(value = "终止任务")
     @PostMapping(value = "/breakProcess/{businessSid}")
     public ResultBean breakProcess(@ApiParam(value = "业务sid") @PathVariable(value = "businessSid") String businessSid,
                                    @RequestBody FlowTaskVo flowTaskVo);
-
+*/
     /**
      * 取消申请
      *

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableRest.java

@@ -117,10 +117,10 @@ public class FlowableRest implements FlowableFeign {
         return flowableService.doneTaskList(userSid, pQuery);
     }
 
-    @Override
+ /*   @Override
     public ResultBean complete(Map<String, Object> variables) {
         return flowableService.complete(variables);
-    }
+    }*/
 
     @Override
     public ResultBean revokeProcess(String userSid, String businessSid, FlowTaskVo flowTaskVo) {
@@ -137,10 +137,10 @@ public class FlowableRest implements FlowableFeign {
         return flowableService.taskReject(businessSid, flowTaskVo);
     }
 
-    @Override
+   /* @Override
     public ResultBean breakProcess(String businessSid, FlowTaskVo flowTaskVo) {
         return flowableService.breakProcess(businessSid, flowTaskVo);
-    }
+    }*/
 
     @Override
     public ResultBean stopProcess(FlowTaskVo flowTaskVo) {

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableService.java

@@ -228,7 +228,7 @@ public class FlowableService extends MybatisBaseService<FlowableMapper, Flowable
      * @param variables
      * @return
      */
-    public ResultBean complete(Map<String, Object> variables) {
+   /* public ResultBean complete(Map<String, Object> variables) {
         BusinessVariables bv = BusinessVariables.builder().build();
         bv.setFormVariables(variables);
         ResultBean<com.yxt.anrui.flowable.api.flowtask.FlowTask> resultBean = flowTaskFeign.businessComplete(bv);
@@ -254,7 +254,7 @@ public class FlowableService extends MybatisBaseService<FlowableMapper, Flowable
         map.put("taskDefKey", taskDefKey);
         sysFormLinkFeign.updateFiled(map);
         return new ResultBean().success();
-    }
+    }*/
 
     /**
      * 撤回
@@ -336,7 +336,7 @@ public class FlowableService extends MybatisBaseService<FlowableMapper, Flowable
      * @param flowTaskVo
      * @return
      */
-    public ResultBean breakProcess(String businessSid, FlowTaskVo flowTaskVo) {
+  /*  public ResultBean breakProcess(String businessSid, FlowTaskVo flowTaskVo) {
         com.yxt.anrui.flowable.api.flowtask.FlowTaskVo fl = new com.yxt.anrui.flowable.api.flowtask.FlowTaskVo();
         BeanUtil.copyProperties(flowTaskVo, fl);
         ResultBean resultBean = flowTaskFeign.breakProcess(fl);
@@ -350,7 +350,7 @@ public class FlowableService extends MybatisBaseService<FlowableMapper, Flowable
         map.put("flowState", FlowComment.STOP.getRemark());
         sysFormLinkFeign.updateFiled(map);
         return resultBean.success();
-    }
+    }*/
 
     public void stopProcess(FlowTaskVo flowTaskVo) {
         com.yxt.anrui.flowable.api.flowtask.FlowTaskVo fl = new com.yxt.anrui.flowable.api.flowtask.FlowTaskVo();