Merge remote-tracking branch 'origin/master'

operation_manager/src/main/java/com/huaxu/order/controller/WorkOrderManageController.java

@@ -416,10 +416,10 @@ public class WorkOrderManageController {
         LoginUser loginUser = UserUtil.getCurrentUser();
         WorkOrderManage workOrderManage = workOrderManageService.selectByPrimaryKey(id);
         if(workOrderManage == null){
-            new AjaxMessage(ResultStatus.ERROR,"工单ID错误！");
+            return new AjaxMessage(ResultStatus.ERROR,"工单ID错误！");
         }
         if(StringUtils.isEmpty(workOrderManage.getCurrentTaskId())){
-            new AjaxMessage(ResultStatus.ERROR,"任务ID错误！");
+            return new AjaxMessage(ResultStatus.ERROR,"任务ID错误！");
         }
         Map<String,Object> args=new HashMap<>();
         args.put("assineeFormUserId",orderUserId);
@@ -484,7 +484,7 @@ public class WorkOrderManageController {
                 loginUser.getCompanyId(),
                 1);
         if(processDefinition == null){
-            new AjaxMessage(ResultStatus.ERROR,"没有创建流程，不能派单！");
+           return new AjaxMessage(ResultStatus.ERROR,"没有创建流程，不能派单！");
         }
         Map<String,Object> vars = new HashMap<>();
         vars.put("assineeFormUserId",orderUserId);

operation_manager/src/main/java/com/huaxu/task/controller/PlanManageController.java

@@ -199,7 +199,7 @@ public class PlanManageController {
                 loginUser.getCompanyId(),
                 2);
         if(processDefinition == null){
-            new AjaxMessage(ResultStatus.ERROR,"没有创建流程，不能提交！");
+            return new AjaxMessage(ResultStatus.ERROR,"没有创建流程，不能提交！");
         }
         Map<String,Object> vars = new HashMap<>();
         vars.put("assineeFormUserId",planManage.getUserId());