|
@@ -896,12 +896,14 @@ public class WorkFullManageController extends BaseController {
|
|
//咨询类别
|
|
//咨询类别
|
|
data.put("consultType",consultType);
|
|
data.put("consultType",consultType);
|
|
//委托单位
|
|
//委托单位
|
|
- if (null != workContractInfo.getClient()) {
|
|
|
|
- data.put("entrustUnit",workContractInfo.getClient().getName());
|
|
|
|
- }else{
|
|
|
|
- data.put("entrustUnit","");
|
|
|
|
|
|
+ if(null != workContractInfo){
|
|
|
|
+ if (null != workContractInfo.getClient()) {
|
|
|
|
+ data.put("entrustUnit",workContractInfo.getClient().getName());
|
|
|
|
+ }else{
|
|
|
|
+ data.put("entrustUnit","");
|
|
|
|
+ }
|
|
|
|
+ data.put("contractNumber",workContractInfo.getContractNum());
|
|
}
|
|
}
|
|
- data.put("contractNumber",workContractInfo.getContractNum());
|
|
|
|
//约定作业期
|
|
//约定作业期
|
|
data.put("promiseTime",promiseTime);
|
|
data.put("promiseTime",promiseTime);
|
|
data.put("projectMaster",ruralProjectRecords.getLeaderNameStr());
|
|
data.put("projectMaster",ruralProjectRecords.getLeaderNameStr());
|