|
@@ -430,10 +430,15 @@ public class QrPackageServiceImpl implements QrPackageService {
|
|
IPage<QrPackageVO> iPage = qrPackageMapper.listQrPackage(PageUtil.createPage(req), req);
|
|
IPage<QrPackageVO> iPage = qrPackageMapper.listQrPackage(PageUtil.createPage(req), req);
|
|
List<QrPackageVO> qrPackageList = iPage.getRecords();
|
|
List<QrPackageVO> qrPackageList = iPage.getRecords();
|
|
|
|
|
|
- //判断是否二级包材厂,如果不是,状态为已创建,如果是按表中值
|
|
|
|
- if(FactoryTypeEnum.TWO_COVER.is(userUtil.getWholeUser().getFactoryType())) {
|
|
|
|
- qrPackageList.stream().forEach(s -> s.setInvalid(QrPackageGenerateStatusEnum.CREATE_BEEN.getCode()));
|
|
|
|
|
|
+ //获取当前用户信息,判断是否一级包材厂,如果是状态为已创建
|
|
|
|
+ if(!ObjectUtils.isEmpty(userUtil.getWholeUser().getFactoryId())){
|
|
|
|
+ BaseFactory factory = baseFactoryMapper.selectById(userUtil.getWholeUser().getFactoryId());
|
|
|
|
+ AssertUtil.isNull(factory,"包材厂数据为空");
|
|
|
|
+ if(FirstFactoryEnum.YES.is(factory.getIsFirstFactory())) {
|
|
|
|
+ qrPackageList.stream().forEach(s -> s.setInvalid(QrPackageGenerateStatusEnum.CREATE_BEEN.getCode()));
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
+
|
|
// 封装出参、放入分页信息
|
|
// 封装出参、放入分页信息
|
|
ListQrPackageRes res = new ListQrPackageRes();
|
|
ListQrPackageRes res = new ListQrPackageRes();
|
|
PageUtil.copyPageInfo(res, iPage);
|
|
PageUtil.copyPageInfo(res, iPage);
|