Merge remote-tracking branch 'origin/develop' into develop

src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java

@@ -42,6 +42,7 @@ import org.activiti.engine.task.Task;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -64,6 +65,9 @@ import io.swagger.annotations.ApiOperation;
 @RestController
 public class TodoTaskController extends BaseAction {
 
+    @Value("${oa.flag}")
+    private Boolean oaFlag;
+
     @Autowired
     private TaskService taskService;
     @Autowired
@@ -348,8 +352,10 @@ public class TodoTaskController extends BaseAction {
 
                 //发送OA已办
                 try {
-                    //发送OA已办
-                    webServiceOAService.completeOA(task);
+                    if(oaFlag){
+                        //发送OA已办
+                        webServiceOAService.completeOA(task);
+                    }
                 }catch (Exception e){
                     logger.error(e.toString());
                 }
@@ -375,8 +381,11 @@ public class TodoTaskController extends BaseAction {
                     formValsService.saveFormVals(formSubmitDto, task.getTaskDefinitionKey());
 
                     try {
-                        //发送OA已办
-                        webServiceOAService.completeOA(task);
+                        if(oaFlag){
+                            //发送OA已办
+                            webServiceOAService.completeOA(task);
+                        }
+
                     }catch (Exception e){
                         logger.error(e.toString());
                     }