From 516e9093120e95147984543e99cba96dd6abb60e Mon Sep 17 00:00:00 2001
From: zjf <1799650030@qq.com>
Date: Wed, 2 Apr 2025 10:31:26 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supermarket/controller/SmErpSpuController.java |  2 +-
 .../service/impl/SmErpSpuServiceImpl.java          | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

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<SmErpSpuImportDto> dtos, BindingResult bindingResult) {
         List<SmErpSpuImportDto> 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<SmErpSpuMapper, SmErpSpuEnt
                                  Long deptId,Long merchantId) {
         try {
             // 查询现有分类
-            SmErpCategoryEntity existCategory = smErpCategoryMapper.selectOne(
+            List<SmErpCategoryEntity> existCategory = smErpCategoryMapper.selectListByScope(
                     new LambdaQueryWrapper<SmErpCategoryEntity>()
-                            .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<SmErpSpuMapper, SmErpSpuEnt
 
         } catch (DuplicateKeyException e) {
             // 处理并发创建冲突
-            SmErpCategoryEntity conflictCategory = smErpCategoryMapper.selectOne(
+            List<SmErpCategoryEntity> conflictCategory = smErpCategoryMapper.selectListByScope(
                     new LambdaQueryWrapper<SmErpCategoryEntity>()
-                            .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());