合同生成问题1

yd-api/src/main/java/com/yd/api/practitioner/service/impl/PractitionerHiringServiceImpl.java

@@ -700,8 +700,8 @@ public class PractitionerHiringServiceImpl implements PractitionerHiringService
 
 
             AclPractitioner practitioner = aclPractitionerMapper.selectByPrimaryKey(practitionerId);
             AclPractitioner practitioner = aclPractitionerMapper.selectByPrimaryKey(practitionerId);
             String practitionerCode = practitioner == null ? null : practitioner.getPractitionerCode();
             String practitionerCode = practitioner == null ? null : practitioner.getPractitionerCode();
-            String contractNo = practitioner == null ? null : practitioner.getContractNo();
-            if (StringUtils.isEmpty(practitionerCode) || StringUtils.isEmpty(contractNo)) {
+
+            if (StringUtils.isEmpty(practitionerCode)) {
                 resp.setCommonResult(new CommonResult(true, "内部编号不能为空，请注意保存"));
                 resp.setCommonResult(new CommonResult(true, "内部编号不能为空，请注意保存"));
                 return resp;
                 return resp;
             }
             }
@@ -710,7 +710,7 @@ public class PractitionerHiringServiceImpl implements PractitionerHiringService
 //                resp.setCommonResult(new CommonResult(true, "合同已存在"));
 //                resp.setCommonResult(new CommonResult(true, "合同已存在"));
 //                return resp;
 //                return resp;
 //            }
 //            }
-            contractNo = hiringContractService.getNextContractNo();
+            String contractNo = hiringContractService.getNextContractNo();
             String contractOssPath = hiringContractService.generatePractitionerContract(practitionerCode, contractNo, hiringBasicInfoId);
             String contractOssPath = hiringContractService.generatePractitionerContract(practitionerCode, contractNo, hiringBasicInfoId);
 
 
             //4、经纪人表生成经纪人记录ag_acl_practitioner，ag_acl_practitioner.contract_oss_path
             //4、经纪人表生成经纪人记录ag_acl_practitioner，ag_acl_practitioner.contract_oss_path