Merge branch 'develop' of http://132.232.206.88:3000/lift-manager/lift-server into huangyuan-user

lift-business-service/src/main/java/cn/com/ty/lift/business/contract/service/ContractService.java

@@ -105,13 +105,14 @@ public class ContractService extends ServiceImpl<ContractsMapper, Contracts> {
                 return RestResponse.fail(MessageUtils.get("msg.add.fail"));
             }
             contracts.setProjectId(info.getId());
+        } else {
+            contracts.setProjectId(projectId);
         }
         if (ObjectUtil.isEmpty(contracts.getCode())) {
             //按当前日期时间戳自动生成合同编号
             String contractCode = DateUtils.generateCode();
             contracts.setCode("HT" + contractCode);
         }
-        contracts.setProjectId(projectId);
         //插入合同信息
         int result = contractsMapper.insert(contracts);
         if (result < 0) {