From 54735fca91f3dc28d6ad009bdc9321b8dd8746d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Sun, 20 Feb 2022 02:05:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=8A=82=E7=82=B9=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E3=80=81=E6=A0=87=E7=AD=BE=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/xm/core/ctrl/XmMenuController.java | 6 +++--- .../java/com/xm/core/ctrl/XmProjectPhaseController.java | 2 +- .../src/main/java/com/xm/core/ctrl/XmTaskController.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmMenuController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmMenuController.java index 3343153c..c3e43913 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmMenuController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmMenuController.java @@ -91,7 +91,7 @@ public class XmMenuController { } List> xmMenuList = xmMenuService.selectListMapByWhere(xmMenu); //列出XmMenu列表 PageUtils.responePage(m, xmMenuList); - if("1".equals(xmMenu.get("withParents")) && !"1".equals(xmMenu.get("isTop"))){ + if("1".equals(xmMenu.get("withParents")) && !"1".equals(xmMenu.get("isTop"))&& xmMenuList.size()>0){ Set pidPathsSet=new HashSet<>(); Set idSet=new HashSet<>(); for (Map map : xmMenuList) { @@ -136,7 +136,7 @@ public class XmMenuController { } List> xmMenuList = xmMenuService.selectListMapByWhereWithState(xmMenu); //列出XmMenu列表 PageUtils.responePage(m, xmMenuList); - if("1".equals(xmMenu.get("withParents")) && !"1".equals(xmMenu.get("isTop"))){ + if("1".equals(xmMenu.get("withParents")) && !"1".equals(xmMenu.get("isTop"))&& xmMenuList.size()>0){ Set pidPathsSet=new HashSet<>(); Set idSet=new HashSet<>(); for (Map map : xmMenuList) { @@ -167,7 +167,7 @@ public class XmMenuController { }else { List> xmMenuList = xmMenuService.selectListMapByWhereWithPlan(xmMenu); //列出XmMenu列表 PageUtils.responePage(m, xmMenuList); - if("1".equals(xmMenu.get("withParents")) && !"1".equals(xmMenu.get("isTop"))){ + if("1".equals(xmMenu.get("withParents")) && !"1".equals(xmMenu.get("isTop"))&& xmMenuList.size()>0){ Set pidPathsSet=new HashSet<>(); Set idSet=new HashSet<>(); for (Map map : xmMenuList) { diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectPhaseController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectPhaseController.java index 6ac23f10..d0a38d4c 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectPhaseController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectPhaseController.java @@ -117,7 +117,7 @@ public class XmProjectPhaseController { PageUtils.startPage(xmProjectPhase); List> xmProjectPhaseList = xmProjectPhaseService.selectListMapByWhere(xmProjectPhase); //列出XmProjectPhase列表 PageUtils.responePage(m, xmProjectPhaseList); - if("1".equals(xmProjectPhase.get("withParents")) && !"1".equals(xmProjectPhase.get("isTop"))){ + if("1".equals(xmProjectPhase.get("withParents")) && !"1".equals(xmProjectPhase.get("isTop")) && xmProjectPhaseList.size()>0){ Set pidPathsSet=new HashSet<>(); Set idSet=new HashSet<>(); for (Map map : xmProjectPhaseList) { diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java index f8ebe903..84ba0ad3 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java @@ -142,7 +142,7 @@ public class XmTaskController { } List> xmTaskVoList = xmTaskService.getTask(xmTask); //列出XmTask列表 PageUtils.responePage(m,xmTaskVoList); - if("1".equals(xmTask.get("withParents")) && !"1".equals(xmTask.get("isTop"))){ + if("1".equals(xmTask.get("withParents")) && !"1".equals(xmTask.get("isTop"))&& xmTaskVoList.size()>0){ Set pidPathsSet=new HashSet<>(); Set idSet=new HashSet<>(); for (Map map : xmTaskVoList) { @@ -234,7 +234,7 @@ public class XmTaskController { }else { xmTaskVoList = xmTaskService.getTask(xmTask); //列出XmTask列表 PageUtils.responePage(m,xmTaskVoList); - if("1".equals(xmTask.get("withParents")) && !"1".equals(xmTask.get("isTop"))){ + if("1".equals(xmTask.get("withParents")) && !"1".equals(xmTask.get("isTop")) && xmTaskVoList.size()>0){ Set pidPathsSet=new HashSet<>(); Set idSet=new HashSet<>();