menu

hx-tenant/src/main/java/com/fjhx/tenant/service/tenant/impl/TenantInfoServiceImpl.java

@@ -59,8 +59,8 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoMapper, TenantI
 
     @Override
     public List<TenantInfo> getList(TenantInfoSelectDto dto) {
-        IWrapper<TenantInfo> wrapper = getWrapper();
-        wrapper.orderByDesc(TenantInfo::getId)
+        IWrapper<TenantInfo> wrapper = getWrapper()
+                .orderByDesc(TenantInfo::getId)
                 .eq(TenantInfo::getStatus, dto.getStatus())
                 .eq(TenantInfo::getFlowStatus, dto.getFlowStatus())
                 .like(TenantInfo::getTenantId, dto.getTenantId())

ruoyi-common/src/main/java/com/ruoyi/common/utils/wrapper/IWrapper.java

@@ -180,9 +180,13 @@ public class IWrapper<T> extends AbstractWrapper<T, String, IWrapper<T>> impleme
     }
 
     public IWrapper<T> keyword(BaseSelectDto selectDto, SqlField... keywordData) {
-        this.and(ObjectUtil.isNotEmpty(selectDto.getKeyword()), q -> {
+        return keyword(selectDto.getKeyword(), keywordData);
+    }
+
+    public IWrapper<T> keyword(String keyword, SqlField... keywordData) {
+        this.and(ObjectUtil.isNotEmpty(keyword), q -> {
             for (SqlField keywordDatum : keywordData) {
-                q.or().like(keywordDatum.getName(), selectDto.getKeyword());
+                q.or().like(keywordDatum.getName(), keyword);
             }
         });
         return typedThis;

ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java

@@ -11,6 +11,12 @@ import java.util.List;
  */
 @JsonInclude(JsonInclude.Include.NON_EMPTY)
 public class RouterVo {
+
+    /**
+     * 类型
+     */
+    private Integer type;
+
     /**
      * 路由名字
      */
@@ -127,4 +133,12 @@ public class RouterVo {
     public void setChildren(List<RouterVo> children) {
         this.children = children;
     }
+
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java

@@ -146,12 +146,14 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
         List<RouterVo> routers = new LinkedList<RouterVo>();
         for (SysMenu menu : menus) {
             RouterVo router = new RouterVo();
+            router.setType(menu.getType());
             router.setHidden("1".equals(menu.getVisible()));
             router.setName(getRouteName(menu));
             router.setPath(getRouterPath(menu));
             router.setComponent(getComponent(menu));
             router.setQuery(menu.getQuery());
             router.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon(), StringUtils.equals("1", menu.getIsCache()), menu.getPath()));
+
             List<SysMenu> cMenus = menu.getChildren();
             if (StringUtils.isNotEmpty(cMenus) && UserConstants.TYPE_DIR.equals(menu.getMenuType())) {
                 router.setAlwaysShow(true);
@@ -196,8 +198,7 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
     public List<SysMenu> buildMenuTree(List<SysMenu> menus) {
         List<SysMenu> returnList = new ArrayList<SysMenu>();
         List<Long> tempList = menus.stream().map(SysMenu::getMenuId).collect(Collectors.toList());
-        for (Iterator<SysMenu> iterator = menus.iterator(); iterator.hasNext(); ) {
-            SysMenu menu = (SysMenu) iterator.next();
+        for (SysMenu menu : menus) {
             // 如果是顶级节点, 遍历该父节点的所有子节点
             if (!tempList.contains(menu.getParentId())) {
                 recursionFn(menus, menu);
@@ -434,10 +435,8 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
      * 得到子节点列表
      */
     private List<SysMenu> getChildList(List<SysMenu> list, SysMenu t) {
-        List<SysMenu> tlist = new ArrayList<SysMenu>();
-        Iterator<SysMenu> it = list.iterator();
-        while (it.hasNext()) {
-            SysMenu n = (SysMenu) it.next();
+        List<SysMenu> tlist = new ArrayList<>();
+        for (SysMenu n : list) {
             if (n.getParentId().longValue() == t.getMenuId().longValue()) {
                 tlist.add(n);
             }