feat:空指针

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/role/impl/HaobanMenuServiceImpl.java

@@ -5,6 +5,7 @@ import com.gic.haoban.manage.service.dao.mapper.role.TabHaobanMenuMapper;
 import com.gic.haoban.manage.service.entity.role.TabHaobanMenu;
 import com.gic.haoban.manage.service.pojo.bo.role.HaobanMenuBO;
 import com.gic.haoban.manage.service.service.role.HaobanMenuService;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -80,9 +81,14 @@ public class HaobanMenuServiceImpl implements HaobanMenuService {
         List<TabHaobanMenu>  notPidMenuList = tabHaobanMenuMapper.getHaobanPidMenuList(wxEnterpriseId, clerkType);
         List<HaobanMenuBO> pidMenuBOList = EntityUtil.changeEntityListNew(HaobanMenuBO.class, pidMenuList);
         List<HaobanMenuBO> notPidMenuBOList = EntityUtil.changeEntityListNew(HaobanMenuBO.class, notPidMenuList);
+        if (CollectionUtils.isEmpty(pidMenuBOList)) {
+            return new ArrayList<>();
+        }
         for (HaobanMenuBO haobanMenuBO : pidMenuBOList) {
-            List<HaobanMenuBO> menus = iterateMenus(notPidMenuBOList, haobanMenuBO.getMenuCode());
-            haobanMenuBO.setMenuBOList(menus);
+            if (CollectionUtils.isNotEmpty(notPidMenuBOList)) {
+                List<HaobanMenuBO> menus = iterateMenus(notPidMenuBOList, haobanMenuBO.getMenuCode());
+                haobanMenuBO.setMenuBOList(menus);
+            }
         }
         return pidMenuBOList;
     }