|
@@ -2445,12 +2445,14 @@ public class WorkProjectNotifyController extends BaseController {
|
|
//获取合同信息
|
|
//获取合同信息
|
|
WorkContractInfo workContractInfo=this.queryWorkContract(projectcontentinfo.getProject().getId());
|
|
WorkContractInfo workContractInfo=this.queryWorkContract(projectcontentinfo.getProject().getId());
|
|
//收费标准
|
|
//收费标准
|
|
- 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);
|
|
|
|
//查询合同对应委托方客户信息
|
|
//查询合同对应委托方客户信息
|
|
if(null != workContractInfo){
|
|
if(null != workContractInfo){
|
|
WorkClientInfo clientInfo = workClientInfoService.get(workContractInfo.getClient().getId());
|
|
WorkClientInfo clientInfo = workClientInfoService.get(workContractInfo.getClient().getId());
|