update...

panzhaov5
1 parent d6d2a007
Showing 1 changed file with 18 additions and 6 deletions
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
@@ -190,6 +190,11 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             ScheduleRealInfo sch = dayOfSchedule.get(schId);
             String gsbm = sch.getGsBm(), fgsbm = sch.getFgsBm();
+            if(StringUtils.isBlank(jGh) || "/".equals(StringUtils.trim(jGh))){
+                rs.put("msg", "无效的参数【驾驶员】");
+                rs.put("status", ResponseCode.ERROR);
+                return rs;
+            }
             //校验运营公司
             Personnel jsy = BasicData.perMap.get(gsbm + "-" + jGh);
             if (null == jsy) {
@@ -197,6 +202,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 rs.put("msg", msg);
                 return rs;
             }
+
             if (!carExist(gsbm, nbbm)) {
                 msg = sch.getGsName() + "没有自编号为" + "[" + nbbm + "]的车辆";
                 rs.put("msg", msg);
@@ -1508,10 +1514,16 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 }
             }
+            if(StringUtils.isBlank(jsy) || "/".equals(StringUtils.trim(jsy))){
+                rs.put("status", ResponseCode.ERROR);
+                rs.put("msg", "无效的参数【驾驶员】");
+                return rs;
+            }
+
             /**
              * 换驾驶员
              */
-            if (StringUtils.isNotEmpty(jsy) && jsy.indexOf("/") != -1) {
+            if (StringUtils.isNotEmpty(jsy)) {
                 String jGh = jsy.split("/")[0];
                 String jName = getPersonName(sch.getGsBm(), jGh);
                 if (StringUtils.isEmpty(jName)) {
@@ -1528,8 +1540,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
              * 换售票员
              */
             String spy = map.get("spy");
-            if (StringUtils.isNotEmpty(spy) && spy.indexOf("/") != -1 && !spy.equals("/")) {
+            if (StringUtils.isNotEmpty(spy) && !StringUtils.trim(spy).equals("/")) {
                 String sGh = spy.split("/")[0];
+
                 String sName = getPersonName(sch.getGsBm(), sGh);
                 if (StringUtils.isEmpty(sName)) {
                     rs.put("msg", sch.getXlName() + "所属的公司编码下找不到工号为【" + sGh + "】的售票员");
@@ -3337,6 +3350,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 }
             }
+
             //为换人换车情况表写入数据
             schModifyLog.saveChangetochange(sch, cpc, userId);
             //日志记录
@@ -3344,8 +3358,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             //换驾驶员
             if (StringUtils.isNotEmpty(cpc.getJsy())) {
-                /*if(!jGh.equals(sch.getjGh()))
-                    sb.append(sch.getjGh() + " 换 " + jGh + ";");*/
                 //换驾驶员
                 if (persoChange(sch, jGh))
                     set.add(sch);
@@ -3353,8 +3365,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             //换售票员
             if (StringUtils.isNotEmpty(cpc.getSpy())
-                    && cpc.getSpy().indexOf("/") != -1
-                    && cpc.getSpy().length() > 1) {
+                    && !"/".equals(StringUtils.trim(cpc.getSpy()))) {
+
                 sGh = cpc.getSpy().split("/")[0];
                 sName = getPersonName(sch.getGsBm(), sGh);
                 if (StringUtils.isEmpty(sName)) {