From c9ce5fffe07cd025c9201a0e72ac37f8709f453c Mon Sep 17 00:00:00 2001
From: xwb <717567226@qq.com>
Date: Thu, 30 Apr 2020 10:32:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=8F=9C=E5=8D=95=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E3=80=81=E5=95=86=E5=93=81=E5=88=86=E7=B1=BB=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E8=8A=82=E7=82=B9=E7=9A=84=E6=80=A7=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../shop/service/impl/YxStoreCategoryServiceImpl.java  | 10 +++++++---
 .../modules/system/service/impl/DeptServiceImpl.java   | 10 +++++++---
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCategoryServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCategoryServiceImpl.java
index 6b5c1bea..13b34b60 100644
--- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCategoryServiceImpl.java
+++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCategoryServiceImpl.java
@@ -128,6 +128,7 @@ public class YxStoreCategoryServiceImpl implements YxStoreCategoryService {
 
         YxStoreCategoryDTO categoryDTO = new YxStoreCategoryDTO();
         Boolean isChild;
+        List<YxStoreCategory> categories = yxStoreCategoryRepository.findAll();
         for (YxStoreCategoryDTO deptDTO : categoryDTOS) {
             isChild = false;
             if ("0".equals(deptDTO.getPid().toString())) {
@@ -144,8 +145,11 @@ public class YxStoreCategoryServiceImpl implements YxStoreCategoryService {
             }
             if(isChild)
                 cates.add(deptDTO);
-            else if(!deptNames.contains(yxStoreCategoryRepository.findNameById(deptDTO.getPid())))
-                cates.add(deptDTO);
+            for (YxStoreCategory category : categories) {
+                if(category.getId()==deptDTO.getPid()&&!deptNames.contains(category.getCateName())){
+                    cates.add(deptDTO);
+                }
+            }
         }
 
 
@@ -164,4 +168,4 @@ public class YxStoreCategoryServiceImpl implements YxStoreCategoryService {
         return map;
         //return null;
     }
-}
\ No newline at end of file
+}
diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/service/impl/DeptServiceImpl.java b/yshop-system/src/main/java/co/yixiang/modules/system/service/impl/DeptServiceImpl.java
index 93696d6b..20eea935 100644
--- a/yshop-system/src/main/java/co/yixiang/modules/system/service/impl/DeptServiceImpl.java
+++ b/yshop-system/src/main/java/co/yixiang/modules/system/service/impl/DeptServiceImpl.java
@@ -72,6 +72,7 @@ public class DeptServiceImpl implements DeptService {
         Set<DeptDTO> depts= new LinkedHashSet<>();
         List<String> deptNames = deptDtos.stream().map(DeptDTO::getName).collect(Collectors.toList());
         boolean isChild;
+        List<Dept> deptList = deptRepository.findAll();
         for (DeptDTO deptDTO : deptDtos) {
             isChild = false;
             if ("0".equals(deptDTO.getPid().toString())) {
@@ -88,8 +89,11 @@ public class DeptServiceImpl implements DeptService {
             }
             if(isChild) {
                 depts.add(deptDTO);
-            } else if(!deptNames.contains(deptRepository.findNameById(deptDTO.getPid()))) {
-                depts.add(deptDTO);
+                for (Dept dept : deptList) {
+                    if(dept.getId() == deptDTO.getPid() && !deptNames.contains(dept.getName())){
+                        depts.add(deptDTO);
+                    }
+                }
             }
         }
 
@@ -158,4 +162,4 @@ public class DeptServiceImpl implements DeptService {
         }
         return deptDtos;
     }
-}
\ No newline at end of file
+}