修改代码

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/ShuntApplyController.java

@@ -98,11 +98,6 @@ public class ShuntApplyController extends BaseController<ShuntApplyBiz, ShuntApp
              .andEqualTo(ShuntApply::getUserId, getCurrentUserIdInt());
             return w;
         });
-//        new ShuntApply(){{
-//            setId(idDTO.getApplyId());
-//            setUserId(getCurrentUserIdInt());
-//            setIsDel(SYS_TRUE);
-//        }}
 
         return ObjectRestResponse.succ();
     }
@@ -286,8 +281,8 @@ public class ShuntApplyController extends BaseController<ShuntApplyBiz, ShuntApp
         PageDataVO<StewardShuntApply> list = PageDataVO.pageInfo(dto.initQuery(), () -> baseBiz.selectByWeekend(w -> {
             if(null != dto.getCityCode()) {
                 w.andEqualTo(ShuntApply::getStartCityCode, dto.getCityCode());
-                w.andEqualTo(ShuntApply::getIsDel, SYS_FALSE);
             }
+            w.andEqualTo(ShuntApply::getIsDel, SYS_FALSE);
             w.andEqualTo(ShuntApply::getStatus, STATUS_CRT);
             return w;
         }, " crt_time desc "), StewardShuntApply.class);
@@ -408,7 +403,7 @@ public class ShuntApplyController extends BaseController<ShuntApplyBiz, ShuntApp
 
     @RequestMapping(value = "/appBusiness/myApplyList", method = RequestMethod.GET)
     @ResponseBody
-    @ApiOperation(value = "我的申请")
+    @ApiOperation(value = "我接过单的申请列表")
     public ObjectRestResponse myApplyList(PageDTO dto) {
         UserDTO userDTO = getBusinessUserByAppUser();
         AssertUtils.isBlank(userDTO);