diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpSpuController.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpSpuController.java index ad1eb3c84..d98721af0 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpSpuController.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpSpuController.java @@ -232,7 +232,7 @@ public class SmErpSpuController { * @return R */ @PostMapping("/import") - @PreAuthorize("@pms.hasPermission('supermarket_supermarketSpu_export')" ) + @PreAuthorize("@pms.hasPermission('supermarket_supermarketSpu_import')" ) public R importErpSpu(@RequestExcel List dtos, BindingResult bindingResult) { List collect = dtos.stream().filter(smErpSpuImportDto -> smErpSpuImportDto.getProductCode() != null).collect(Collectors.toList()); if (CollectionUtils.isEmpty(collect)) { diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpSpuServiceImpl.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpSpuServiceImpl.java index ae27d85e2..4000cedc5 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpSpuServiceImpl.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpSpuServiceImpl.java @@ -799,13 +799,13 @@ public class SmErpSpuServiceImpl extends ServiceImpl existCategory = smErpCategoryMapper.selectListByScope( new LambdaQueryWrapper() - .eq(SmErpCategoryEntity::getName, categoryName) + .eq(SmErpCategoryEntity::getName, categoryName),DataScope.of() ); - if (existCategory != null) { - return existCategory.getId(); + if (CollectionUtils.isNotEmpty(existCategory)) { + return existCategory.get(0).getId(); } // 创建新分类 @@ -824,11 +824,11 @@ public class SmErpSpuServiceImpl extends ServiceImpl conflictCategory = smErpCategoryMapper.selectListByScope( new LambdaQueryWrapper() - .eq(SmErpCategoryEntity::getName, categoryName) + .eq(SmErpCategoryEntity::getName, categoryName),DataScope.of() ); - return conflictCategory != null ? conflictCategory.getId() : null; + return conflictCategory != null ? conflictCategory.get(0).getId() : null; } catch (Exception e) { errorReasons.add("分类处理异常: " + e.getMessage());