新增报告审查合同信息处理修改

src/main/java/com/jeeplus/modules/workprojectnotify/web/WorkProjectNotifyController.java

@@ -2062,17 +2062,20 @@ public class WorkProjectNotifyController extends BaseController {
 					List<SubProjectInfo> subProjectInfos=this.queryReportDetails(projectcontentinfo.getProject().getId());
 					//获取合同信息
 					WorkContractInfo workContractInfo=this.queryWorkContract(projectcontentinfo.getProject().getId());
+					//收费标准
 					//查询合同对应委托方客户信息
 					if(null != workContractInfo){
 						WorkClientInfo clientInfo = workClientInfoService.get(workContractInfo.getClient().getId());
 						model.addAttribute("workClientInfo", clientInfo);
-						//收费标准
-						String [] biao=workContractInfo.getChargeCriterion().split(",");
-						List<String> chargeCriterionList=new ArrayList<>();
-						for (int i=0;i<biao.length;i++){
-							chargeCriterionList.add(biao[i]);
+						if(StringUtils.isNotBlank(workContractInfo.getChargeCriterion())){
+							//收费标准
+							String [] biao=workContractInfo.getChargeCriterion().split(",");
+							List<String> chargeCriterionList=new ArrayList<>();
+							for (int i=0;i<biao.length;i++){
+								chargeCriterionList.add(biao[i]);
+							}
+							projectcontentinfo.setChargeCriterionList(chargeCriterionList);
 						}
-						projectcontentinfo.setChargeCriterionList(chargeCriterionList);
 					}
 					model.addAttribute("processInstanceId",projectReportData.getProcessInstanceId());
 					model.addAttribute("projectId", projectcontentinfo.getProject().getId());
@@ -2445,29 +2448,19 @@ public class WorkProjectNotifyController extends BaseController {
 					//获取合同信息
 					WorkContractInfo workContractInfo=this.queryWorkContract(projectcontentinfo.getProject().getId());
 					//收费标准
-					if(StringUtils.isNotBlank(workContractInfo.getChargeCriterion())){
-						String [] biao=workContractInfo.getChargeCriterion().split(",");
-						List<String> chargeCriterionList=new ArrayList<>();
-						for (int i=0;i<biao.length;i++){
-							chargeCriterionList.add(biao[i]);
-						}
-						projectcontentinfo.setChargeCriterionList(chargeCriterionList);
-					}
 					//查询合同对应委托方客户信息
 					if(null != workContractInfo){
 						WorkClientInfo clientInfo = workClientInfoService.get(workContractInfo.getClient().getId());
 						model.addAttribute("workClientInfo", clientInfo);
-					//查询合同对应委托方客户信息
-					if(null != workContractInfo){
-						WorkClientInfo clientInfo = workClientInfoService.get(workContractInfo.getClient().getId());
-						model.addAttribute("workClientInfo", clientInfo);
-						//收费标准
-						String [] biao=workContractInfo.getChargeCriterion().split(",");
-						List<String> chargeCriterionList=new ArrayList<>();
-						for (int i=0;i<biao.length;i++){
-							chargeCriterionList.add(biao[i]);
+						if(StringUtils.isNotBlank(workContractInfo.getChargeCriterion())){
+							//收费标准
+							String [] biao=workContractInfo.getChargeCriterion().split(",");
+							List<String> chargeCriterionList=new ArrayList<>();
+							for (int i=0;i<biao.length;i++){
+								chargeCriterionList.add(biao[i]);
+							}
+							projectcontentinfo.setChargeCriterionList(chargeCriterionList);
 						}
-						projectcontentinfo.setChargeCriterionList(chargeCriterionList);
 					}
 					model.addAttribute("processInstanceId",projectReportData.getProcessInstanceId());
 					model.addAttribute("projectId", projectcontentinfo.getProject().getId());