From 2b83e417b7a8de5c6972207a77fd1810ea1029a0 Mon Sep 17 00:00:00 2001
From: msgroup <dev@mingsoft.net>
Date: Tue, 23 Feb 2021 18:54:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E4=BC=98=E5=8C=96=EF=BC=8C?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=9A=E5=A6=82=E6=9E=9C=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E6=8C=87=E5=AE=9A=E5=88=86=E7=B1=BBid?=
 =?UTF-8?q?=EF=BC=8C=E4=B8=9A=E5=8A=A1=E4=BB=A3=E7=A0=81=E5=9B=9E=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=89=80=E6=9C=89=E5=88=B0=E6=A0=8F=E7=9B=AEID?=
 =?UTF-8?q?=E7=84=B6=E5=90=8E=E4=BC=A0=E9=80=92=E7=BB=99find=5Fin=5Fset?=
 =?UTF-8?q?=E5=87=BD=E6=95=B0=EF=BC=8C=E6=80=A7=E8=83=BD=E6=9C=89=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E3=80=81oracle=E5=87=BD=E6=95=B0=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E5=8F=98=E9=87=8F=E9=95=BF=E5=BA=A6=E4=B9=9F=E4=BC=9A=E5=AD=98?=
 =?UTF-8?q?=E5=9C=A8=E9=97=AE=E9=A2=98=E3=80=82=E8=A7=A3=E5=86=B3=EF=BC=9A?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=9F=A5=E8=AF=A2=E6=89=80=E6=9C=89=E7=9A=84?=
 =?UTF-8?q?=E5=88=86=E7=B1=BBid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mingsoft/cms/action/web/MCmsAction.java   | 39 ++++++++++---------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git a/src/main/java/net/mingsoft/cms/action/web/MCmsAction.java b/src/main/java/net/mingsoft/cms/action/web/MCmsAction.java
index 862026fa..f60492fa 100755
--- a/src/main/java/net/mingsoft/cms/action/web/MCmsAction.java
+++ b/src/main/java/net/mingsoft/cms/action/web/MCmsAction.java
@@ -347,30 +347,33 @@ public class MCmsAction extends net.mingsoft.cms.action.BaseAction {
         //获取栏目信息
         String typeId = null;
         String categoryIds = BasicUtil.getString("categoryIds");
-        List categoryIdList = CollectionUtil.newArrayList();
+
+        //List categoryIdList = CollectionUtil.newArrayList();
+
         //当传递了栏目编号，但不是栏目集合
         if (StringUtils.isNotBlank(categoryIds) && !categoryIds.contains(",")) {
             typeId = categoryIds;
-        } else {
-            //取出所有的子栏目
-            String[] ids = categoryIds.split(",");
-            List<CategoryEntity> categoryList = categoryBiz.list(Wrappers.<CategoryEntity>lambdaQuery().ne(CategoryEntity::getCategoryType, CategoryTypeEnum.LINK.toString()));
-
-            categoryIdList = CollectionUtil.newArrayList(ids);
-            for(CategoryEntity c:categoryList) {
-                if(StringUtils.isNotEmpty(c.getParentids())) {
-                    for(String id:ids) {
-                        if(c.getParentids().indexOf(id)>-1) {
-                            categoryIdList.add(c.getId());
-                            break;
-                        }
-                    }
-                }
-            }
         }
+//        else {
+//            //取出所有的子栏目
+//            String[] ids = categoryIds.split(",");
+//            List<CategoryEntity> categoryList = categoryBiz.list(Wrappers.<CategoryEntity>lambdaQuery().ne(CategoryEntity::getCategoryType, CategoryTypeEnum.LINK.toString()));
+//
+//            categoryIdList = CollectionUtil.newArrayList(ids);
+//            for(CategoryEntity c:categoryList) {
+//                if(StringUtils.isNotEmpty(c.getParentids())) {
+//                    for(String id:ids) {
+//                        if(c.getParentids().indexOf(id)>-1) {
+//                            categoryIdList.add(c.getId());
+//                            break;
+//                        }
+//                    }
+//                }
+//            }
+//        }
 
         //重新组织 ID
-        categoryIds = StringUtils.join(categoryIdList, ",");
+        //categoryIds = StringUtils.join(categoryIdList, ",");
 
 
         //根据栏目确定自定义模型