tj

VisualInspection_server/src/main/java/com/xintong/visualinspection/service/impl/StatisticsServiceImpl.java

@@ -1241,9 +1241,18 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 			int seq = 1 ;
 			for(StatisticsBean sta : list){
 				sta.setId(seq++);
-				sta.setCheckman_name( CacheUtil.getUserFromMap(sta.getCheckman_id()+0L).getTruename()  ); 
-				sta.setChecked_name( CacheUtil.getUserFromMap(sta.getUser_id()+0L).getTruename());
-				sta.setFeeStationName( CacheUtil.getOrganFromMap(sta.getDept_id()).getOrganname() );
+				User user = CacheUtil.getUserFromMap(sta.getCheckman_id()+0L) ;
+				if(user != null){
+					sta.setCheckman_name(user.getTruename()); 					
+				}
+				user = CacheUtil.getUserFromMap(sta.getUser_id()+0L) ;
+				if(user != null ){
+					sta.setChecked_name( user.getTruename());					
+				}
+				Organ organ = CacheUtil.getOrganFromMap(sta.getDept_id());
+				if(organ != null){
+					sta.setFeeStationName( organ.getOrganname() );					
+				}
 				SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm");
 				SimpleDateFormat formatter2 = new SimpleDateFormat("- HH:mm");
 				sta.setCheck_task_time_name( formatter.format(sta.getStart_date())+formatter2.format(sta.getEnd_date()));