From c755f1c73ebec9f46fbc9eb85403dc7be1919dc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Mon, 13 Feb 2023 21:44:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E8=A1=A8=E5=A4=B4BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../head/service/impl/HeadCustomEOServiceImpl.java  | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/service/impl/HeadCustomEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/service/impl/HeadCustomEOServiceImpl.java
index 283c9779c..fe568987f 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/service/impl/HeadCustomEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/service/impl/HeadCustomEOServiceImpl.java
@@ -219,6 +219,7 @@ public class HeadCustomEOServiceImpl extends ServiceImpl<HeadCustomEOMapper, Hea
         wrapper.in(HeadCustomEO::getCreateBy, loginUser.getUsername()).in(HeadCustomEO::getModuleFlag, moduleFlag);
         List<HeadCustomEO> list = this.list(wrapper);
         List<HeadCustomVO> headCustomVOOneList = new LinkedList<>();
+        List<HeadCustomVO> res = new ArrayList<>();
         if (ObjectUtils.isNotEmpty(list)) {
             //列表表头一级
             List<HeadCustomEO> oneList = list.stream()
@@ -246,13 +247,11 @@ public class HeadCustomEOServiceImpl extends ServiceImpl<HeadCustomEOMapper, Hea
                 getHeadCustomVO(cut, headCustomEO, headCustomVO);
                 headCustomVOOneList.add(headCustomVO);
             }
-        }
-
-        List<HeadCustomVO> res = new ArrayList<>();
-        if ("法规清单".equals(moduleFlag) || "虚拟清单详情".equals(moduleFlag) || "维护清单".equals(moduleFlag)) {
-            res = checkDefaultHead(headCustomVOOneList, cut, moduleFlag);
-        } else {
-            res = headCustomVOOneList;
+            if ("法规清单".equals(moduleFlag) || "虚拟清单详情".equals(moduleFlag) || "维护清单".equals(moduleFlag)) {
+                res = checkDefaultHead(headCustomVOOneList, cut, moduleFlag);
+            } else {
+                res = headCustomVOOneList;
+            }
         }
         return res;
     }