Merge remote-tracking branch 'origin/dev_business' into dev_business

云

4 天以前 7188f28998d47c286e34cbd525986603cfc19ba9

 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/batch/MesWmBatchMapper.java

@@ -72,12 +72,12 @@
                .betweenIfPresent(MesWmBatchDO::getExpireDate, reqVO.getExpireDate())
                .betweenIfPresent(MesWmBatchDO::getReceiptDate, reqVO.getReceiptDate())
                .orderByDesc(MesWmBatchDO::getId);
        if (permittedClientIds != null) {
            if (CollUtil.isEmpty(permittedClientIds)) {
                return PageResult.empty();
            }
            wrapper.in(MesWmBatchDO::getClientId, permittedClientIds);
        }
//        if (permittedClientIds != null) {
//            if (CollUtil.isEmpty(permittedClientIds)) {
//                return PageResult.empty();
//            }
//            wrapper.in(MesWmBatchDO::getClientId, permittedClientIds);
//        }
        return selectPage(reqVO, wrapper);
    }