时刻表分析公司，分公司查询null判断

廖磊
1 parent 45776ffe
Showing 1 changed file with 9 additions and 5 deletions
src/main/java/com/bsth/service/schedule/PeopleCarPlanServiceImpl.java
@@ -495,8 +495,12 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		Map<String, List<ScheduleRealInfo>> keyMap = new HashMap<String, List<ScheduleRealInfo>>();
 		Map<String, Object> modelMap = new HashMap<String, Object>();
-		String company = map.get("company").toString();
-		String subCompany = map.get("subCompany").toString();
+		String company = "";
+		if(map.get("company")!=null)
+			company=map.get("company").toString();
+		String subCompany = "";
+		if(map.get("subCompany")!=null)
+			subCompany=map.get("subCompany").toString();
 		String page = map.get("page").toString();
 		String line = map.get("line").toString();
 		String startDate = map.get("startDate").toString();
@@ -516,9 +520,9 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 			if(line.length() != 0){
 				sql += " and xl_bm = '"+line+"'";
 			}
-			if(company.length() != 0){
-				sql += " and gs_bm = '"+company+"' and fgs_bm = '"+subCompany+"'";
-			}
+//			if(company.length() != 0){
+				sql += " and gs_bm like %'"+company+"'% and fgs_bm like %'"+subCompany+"%'";
+//			}
 			sql += " and bc_type != 'in' and bc_type != 'out'";
 			list = jdbcTemplate.query(sql,