Browse Source

签发文档合同编号判null修改

user5 4 years atrás
parent
commit
843cebc1f2

+ 4 - 1
src/main/java/com/jeeplus/modules/workfullmanage/web/WorkFullManageController.java

@@ -1289,7 +1289,10 @@ public class WorkFullManageController extends BaseController {
 			projectReportDataTwo.setPrincipal(user);
 		}
 		//获取合同信息
-		WorkContractInfo workContractInfo = workContractInfoService.get(ruralProjectRecords.getWorkContractInfo().getId());
+		WorkContractInfo workContractInfo = null;
+		if(null != ruralProjectRecords.getWorkContractInfo() && StringUtils.isNotBlank(ruralProjectRecords.getWorkContractInfo().getId())){
+			workContractInfo = workContractInfoService.get(ruralProjectRecords.getWorkContractInfo().getId());
+		}
 		//无合同状态下,获取委托方的名称
 		if (workContractInfo == null) {
 			projectRecordsService.queryLinkmanInfos(ruralProjectRecords);