项目登记无合同问题解决

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralCostProjectRecordsController.java

@@ -326,9 +326,11 @@ public class RuralCostProjectRecordsController extends BaseController {
             } else {//新增表单保存
             	//判断当前的合同是否被作废或者删除
 				WorkContractInfo workContractInfo = contractInfoService.get(projectRecords.getWorkContractInfo().getId());
-				if ("7".equals(workContractInfo.getContractState()) || "1"==workContractInfo.getDelFlag()){
-					addMessage(redirectAttributes, "该项目选择的合同已被作废或删除");
-					return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectRecords/?repage";
+				if (null != workContractInfo){
+					if ( "7".equals(workContractInfo.getContractState()) || "1"==workContractInfo.getDelFlag()){
+						addMessage(redirectAttributes, "该项目选择的合同已被作废或删除");
+						return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectRecords/?repage";
+					}
 				}
 				//添加查询类型(造价审核)
 				projectRecords.setProjectType("2");

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectRecordsController.java

@@ -300,6 +300,14 @@ public class RuralProjectRecordsController extends BaseController {
 					return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectRecords/?repage";
 				}*/
             } else {//新增表单保存
+				//判断当前的合同是否被作废或者删除
+				WorkContractInfo workContractInfo = contractInfoService.get(projectRecords.getWorkContractInfo().getId());
+				if (null != workContractInfo){
+					if ( "7".equals(workContractInfo.getContractState()) || "1"==workContractInfo.getDelFlag()){
+						addMessage(redirectAttributes, "该项目选择的合同已被作废或删除");
+						return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectRecords/?repage";
+					}
+				}
 				//添加查询类型(工程咨询)
 				projectRecords.setProjectType("1");
                 projectRecordsService.saveProject(projectRecords, ProjectStatusEnum.SIGNED);//保存