|
@@ -268,7 +268,9 @@ public class WorkContractInfoService extends CrudService<WorkContractInfoDao, Wo
|
|
if(list1!=null && list1.size()>0){
|
|
if(list1!=null && list1.size()>0){
|
|
for(WorkContractClient w :list1){
|
|
for(WorkContractClient w :list1){
|
|
WorkClientInfo workClientInfo = workClientInfoService.getById(w.getClientId());
|
|
WorkClientInfo workClientInfo = workClientInfoService.getById(w.getClientId());
|
|
- list2.add(workClientInfo);
|
|
|
|
|
|
+ if(null != workClientInfo){
|
|
|
|
+ list2.add(workClientInfo);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
workContractInfo.setWorkClientInfoList(list2);
|
|
workContractInfo.setWorkClientInfoList(list2);
|
|
}
|
|
}
|