Merge remote-tracking branch 'origin/uat-temp-nht-2505260000-47177' into mes-test

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesBoxingErrorProofingService.java

@@ -90,6 +90,9 @@ public class MesBoxingErrorProofingService implements IMesBoxingErrorProofingSer
 
         DdlPackBean packBean = DdlPackBean.getDdlPackBean(mesPackage.getOrganizeCode());
         DdlPreparedPack.getStringEqualPack(mesPackage.getPackageNo(), MesPcnExtConstWords.PACKAGE_NO, packBean);
+        if (pager == null || Objects.equals(pager.getPageSize(), 0)) {
+            return new ListPager<>(mesPackageDetailRDao.findByHqlWhere(packBean), pager);
+        }
         pager = PagerHelper.getPager(pager, mesPackageDetailRDao.findByHqlWhereCount(packBean));
         List<MesPackageDetail> resultList = mesPackageDetailRDao.findByHqlWherePage(packBean, pager);
         return new ListPager<>(resultList, pager);