代码优化

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/controller/ApplyController.java

@@ -71,9 +71,8 @@ public class ApplyController extends BaseController {
      * 查询出差申请单个人
      */
     @GetMapping("/list/self")
-    public TableDataInfo<ApplyVo> listSelf(PageQuery pageQuery) {
-        ApplyBo bo = new ApplyBo()
-            .setApplyUserId(LoginHelper.getUserId());
+    public TableDataInfo<ApplyVo> listSelf(ApplyBo bo, PageQuery pageQuery) {
+        bo.setApplyUserId(LoginHelper.getUserId());
         return applyService.queryPageList(bo, pageQuery);
     }
 

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/service/impl/ApplyServiceImpl.java

@@ -64,7 +64,7 @@ public class ApplyServiceImpl extends AbstractBaseService<ApplyVo, ApplyBo, Appl
         lqw.eq(bo.getApplyTime() != null, Apply::getApplyTime, bo.getApplyTime());
         lqw.eq(StringUtils.isNotEmpty(bo.getAddress()), Apply::getAddress, bo.getAddress());
         lqw.eq(bo.getStartTime() != null, Apply::getStartTime, bo.getStartTime());
-        lqw.eq(bo.getEndTime() != null, Apply::getEndTime, bo.getEndTime());
+        lqw.ge(bo.getEndTime() != null, Apply::getEndTime, bo.getEndTime());
         lqw.eq(StringUtils.isNotEmpty(bo.getApplyReason()), Apply::getApplyReason, bo.getApplyReason());
         lqw.eq(StringUtils.isNotEmpty(bo.getStatus()), Apply::getStatus, bo.getStatus());
         Optional.ofNullable(params).map(map -> map.get("phone"))