回库程序

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/dal/mysql/museumflow/MuseumFlowMapper.java

@@ -115,6 +115,8 @@ public interface MuseumFlowMapper extends BaseMapperX<MuseumFlowDO> {
                 .likeIfPresent(MuseumFlowDO::getPurpose,pageVO.getPurpose())
                 .likeIfPresent(MuseumFlowDO::getRejectSeason,pageVO.getRejectSeason())
                 .likeIfPresent(MuseumFlowDO::getApplyPerson, pageVO.getApplyPerson())
+                .likeIfPresent(MuseumFlowDO::getApplyUnit, pageVO.getApplyUnit())
+                .likeIfPresent(MuseumFlowDO::getReturnExpect, pageVO.getReturnExpect())
                 .likeIfPresent(MuseumFlowDO::getReceivePerson, pageVO.getReceivePerson())
                 .likeIfPresent(MuseumFlowDO::getOutboundPerson, pageVO.getOutboundPerson())
                 .likeIfPresent(MuseumFlowDO::getPurpose, pageVO.getPurpose())
@@ -123,7 +125,6 @@ public interface MuseumFlowMapper extends BaseMapperX<MuseumFlowDO> {
                 .betweenIfPresent(MuseumFlowDO::getReviewTime,pageVO.getReviewTime())
                 .betweenIfPresent(MuseumFlowDO::getReturnTime,pageVO.getReturnTime())
                 .eqIfPresent(MuseumFlowDO::getState, pageVO.getState())
-                .eqIfPresent(MuseumFlowDO::getId, pageVO.getOutboundPerson())
                 .orderByDesc(MuseumFlowDO::getId);
         if (pageVO.getNumber()!=null &&!pageVO.getNumber().isEmpty()) {
             queryWrapper.apply("JSON_CONTAINS(number, CAST({0} AS JSON))", pageVO.getNumber());