物资车入场申请

huimv-receive/src/main/java/com/huimv/receive/service/impl/BillPersonnelAdmissionServiceImpl.java

@@ -304,7 +304,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
         if (ObjectUtil.isEmpty(baseWashoutPoint1)){
             baseWashoutPoints = baseWashoutPointMapper.selectList(new QueryWrapper<BaseWashoutPoint>().lambda().le(BaseWashoutPoint::getPointLevel,baseWashoutPoint2.getPointLevel()).eq(BaseWashoutPoint::getVisitingType, vistitType).like(BaseWashoutPoint::getFarmIds, farmId).orderByAsc(BaseWashoutPoint::getPointLevel));
         }else {
-            baseWashoutPoints = baseWashoutPointMapper.selectList(new QueryWrapper<BaseWashoutPoint>().lambda().le(BaseWashoutPoint::getPointLevel,baseWashoutPoint2.getPointLevel()).eq(BaseWashoutPoint::getVisitingType, vistitType).like(BaseWashoutPoint::getFarmIds, farmId).ge(BaseWashoutPoint::getPointLevel,baseWashoutPoint1.getPointLevel()).orderByAsc(BaseWashoutPoint::getPointLevel));
+            baseWashoutPoints = baseWashoutPointMapper.selectList(new QueryWrapper<BaseWashoutPoint>().lambda().gt(BaseWashoutPoint::getPointLevel,baseWashoutPoint1.getPointLevel()).le(BaseWashoutPoint::getPointLevel,baseWashoutPoint2.getPointLevel()).eq(BaseWashoutPoint::getVisitingType, vistitType).like(BaseWashoutPoint::getFarmIds, farmId).ge(BaseWashoutPoint::getPointLevel,baseWashoutPoint1.getPointLevel()).orderByAsc(BaseWashoutPoint::getPointLevel));
         }
         for (BaseWashoutPoint baseWashoutPoint : baseWashoutPoints) {
             allLocation = allLocation + "," + baseLocationMapper.selectById(baseWashoutPoint.getLocationId()).getLocationName();