Browse Source

外勤计划增加为空判断

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@7433 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d
hejq 9 years ago
parent
commit
f05cb24086

+ 24 - 22
src/main/java/com/uas/platform/b2b/mobile/service/impl/OutPlanServiceImpl.java

@@ -80,28 +80,30 @@ public class OutPlanServiceImpl implements OutPlanService {
 				String addSql = "select p.oad_longitude md_longitude, p.oad_latitude md_latitude from mobile$outaddress p where oad_address = '"
 						+ detail.getMpd_address() + "'";
 				List<OutAddress> addrs = commonDao.query(addSql, OutAddress.class);
-				OutAddress addr = addrs.get(0);
-				OutPlanInfo info = new OutPlanInfo();
-				info.setEnuu(detail.getEnuu());
-				info.setMd_latitude(addr.getMd_latitude());
-				info.setMd_longitude(addr.getMd_longitude());
-				info.setMp_id(outPlan.getMp_id());
-				info.setMpd_mpid(outPlan.getMp_id());
-				info.setMpd_actdate(detail.getMpd_actdate());
-				info.setMpd_address(detail.getMpd_address());
-				info.setMpd_arrivedate(detail.getMpd_arrivedate());
-				info.setMpd_distance(detail.getMpd_distance());
-				info.setMpd_id(detail.getMpd_id());
-				info.setMpd_kind(detail.getMpd_kind());
-				info.setMpd_location(detail.getMpd_location());
-				info.setMpd_outdate(detail.getMpd_outdate());
-				info.setMpd_recorddate(detail.getMpd_recorddate());
-				info.setMpd_remark(detail.getMpd_remark());
-				info.setMpd_status(detail.getMpd_status());
-				info.setMpd_company(detail.getMpd_company());
-				info.setMp_firsttime(detail.getMpd_firsttime());
-				info.setMp_lasttime(detail.getMpd_lasttime());
-				infos.add(info);
+				if (!CollectionUtils.isEmpty(addrs)) {
+					OutAddress addr = addrs.get(0);
+					OutPlanInfo info = new OutPlanInfo();
+					info.setEnuu(detail.getEnuu());
+					info.setMd_latitude(addr.getMd_latitude());
+					info.setMd_longitude(addr.getMd_longitude());
+					info.setMp_id(outPlan.getMp_id());
+					info.setMpd_mpid(outPlan.getMp_id());
+					info.setMpd_actdate(detail.getMpd_actdate());
+					info.setMpd_address(detail.getMpd_address());
+					info.setMpd_arrivedate(detail.getMpd_arrivedate());
+					info.setMpd_distance(detail.getMpd_distance());
+					info.setMpd_id(detail.getMpd_id());
+					info.setMpd_kind(detail.getMpd_kind());
+					info.setMpd_location(detail.getMpd_location());
+					info.setMpd_outdate(detail.getMpd_outdate());
+					info.setMpd_recorddate(detail.getMpd_recorddate());
+					info.setMpd_remark(detail.getMpd_remark());
+					info.setMpd_status(detail.getMpd_status());
+					info.setMpd_company(detail.getMpd_company());
+					info.setMp_firsttime(detail.getMpd_firsttime());
+					info.setMp_lasttime(detail.getMpd_lasttime());
+					infos.add(info);
+				}
 			}
 			Set<OutPlanDetail> planDetails = new HashSet<OutPlanDetail>();
 			planDetails.addAll(details);