Merge remote-tracking branch 'origin/master'

laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/controller/ProcessESInitChangeController.java

@@ -12,7 +12,6 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
-import javax.validation.Valid;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -40,7 +39,7 @@ public class ProcessESInitChangeController {
     @AutoLog(value = "企标立项变更流程-生成企标编号并返回")
     @ApiOperation(value="企标立项变更流程-生成企标编号并返回", notes="企标立项变更流程-生成企标编号并返回")
     @PostMapping("/getStandardNo")
-    public Result<?> getStandardNo(@Valid @RequestBody ProcessEsInitChange esInitChange) {
+    public Result<?> getStandardNo(@RequestBody ProcessEsInitChange esInitChange) {
         // 生成企标编号并返回
         Map<String, Object> map = new HashMap<>();
         map.put(FieldCommon.ENTERPRISE_STANDARD_CODE, esInitChange.getEnStandardCode());
@@ -62,8 +61,9 @@ public class ProcessESInitChangeController {
                                 @RequestBody List<ProcessEsInitChange> esInitChangeList) {
         if (StrUtil.isBlank(taskId)) {
             initChangeService.saveToDraft(esInitChangeList);
+        } else {
+            initChangeService.saveToWait(taskId, esInitChangeList);
         }
-        initChangeService.saveToWait(taskId, esInitChangeList);
         return Result.OK();
     }