Merge remote-tracking branch 'origin/dev1.0' into dev1.0

src/main/java/com/sunxung/factoring/service/salescontractmanagement/impl/SalesContractServiceImpl.java

@@ -125,10 +125,6 @@ public class SalesContractServiceImpl extends ServiceImpl<SalesContractMapper, C
 
             //开启流程
             startSalesContractProcess(salesContractManagement);
-            //变更项目的是否已做销售合同标识
-            projectInformationService.lambdaUpdate().set(ProjectInformation::getSales, 1)
-                    .eq(ProjectInformation::getBusinessNumber, salesContractManagement.getBusinessNumber())
-                    .update();
         } else {
             updateById(salesContractManagement);
             //文件处理
@@ -144,6 +140,10 @@ public class SalesContractServiceImpl extends ServiceImpl<SalesContractMapper, C
             }
 
         }
+        //变更项目的是否已做销售合同标识
+        projectInformationService.lambdaUpdate().set(ProjectInformation::getSales, 1)
+                .eq(ProjectInformation::getBusinessNumber, salesContractManagement.getBusinessNumber())
+                .update();
 
         //查询taskId
         BusinessProcessingLog lastLog = businessProcessingLogService