fix: 添加测试人员

guzijian
1 parent bf6c26e7
Showing 1 changed file with 9 additions and 10 deletions
ruoyi-admin/src/main/java/com/ruoyi/driver/service/impl/DriverServiceImpl.java
@@ -336,18 +336,17 @@ public class DriverServiceImpl implements IDriverService {
         for (Driver item : drivers) {
             dto = schedulingService.queryScheduling(item.getJobCode(), now);
             DriverResponseVo vo = handlerRecommendation(item, now, dto, schedulingFlag, alcoholFlag);
-            // 无排班
-            if (Objects.isNull(vo)) {
-                vos.add(DriverResponseVo.createDriverResponseVo(null, item, null, false, false, "", "", ""));
-            } else {
-                vos.add(vo);
-            }
-            if (item.getJobCode().equals("722717")) {
-                vos.add(DriverResponseVo.createDriverResponseVo(null, item, null, true, true, "测试", "测试", "测试"));
-            }
-            if (item.getJobCode().equals("700001")) {
+            if (item.getJobCode().equals("722717") || item.getJobCode().equals("700001")) {
                 vos.add(DriverResponseVo.createDriverResponseVo(null, item, null, true, true, "测试", "测试", "测试"));
+            }else {
+                // 无排班
+                if (Objects.isNull(vo)) {
+                    vos.add(DriverResponseVo.createDriverResponseVo(null, item, null, false, false, "", "", ""));
+                } else {
+                    vos.add(vo);
+                }
             }
+
         }
         return vos;
     }