ソースを参照

bugfix:权限,登录返回树形

lyx 3 ヶ月 前
コミット
52af3f894e

+ 4 - 0
alien-entity/src/main/java/shop/alien/entity/store/LifeSysMenu.java

@@ -9,6 +9,7 @@ import lombok.Data;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 菜单权限表
@@ -104,5 +105,8 @@ public class LifeSysMenu {
     @ApiModelProperty(value = "子菜单列表(用于树形结构)")
     @TableField(exist = false)
     private List<LifeSysMenu> children;
+
+    @TableField(exist = false)
+    private Map<String,Object> meta;
 }
 

+ 1 - 1
alien-gateway/src/main/java/shop/alien/gateway/service/impl/SystemServiceImpl.java

@@ -86,10 +86,10 @@ public class SystemServiceImpl implements SystemService {
             tokenMap.put("userType", "web");
             R<List<LifeSysMenu>> menuByUserId = storeServiceFeign.getMenuByUserId(lifeSys.getId().longValue(), 1L);
             List<LifeSysMenu> data = menuByUserId.getData();
-            tokenMap.put("menuList", JSONObject.toJSONString(data));
             //存入token
             result.setToken(JwtUtil.createJWT("web_" + lifeSys.getId(), lifeSys.getUserName(), JSONObject.toJSONString(tokenMap), effectiveTimeIntLong));
             baseRedisService.setString("web_" + lifeSys.getUserName(), result.getToken());
+            tokenMap.put("menuList", JSONObject.toJSONString(data));
             //登录结果
             result.setResult(true);
             //角色Id

+ 9 - 1
alien-store/src/main/java/shop/alien/store/service/impl/LifeSysMenuServiceImpl.java

@@ -382,7 +382,15 @@ public class LifeSysMenuServiceImpl implements LifeSysMenuService {
         for (LifeSysMenu menu : flatList) {
             Long menuId = menu.getMenuId();
             Long parentId = menu.getParentId() != null ? menu.getParentId() : 0L;
-
+            HashMap<String, Object> metaMap = new HashMap<>();
+            metaMap.put("title",menu.getMenuName());
+            metaMap.put("isFull","false");
+            if (menu.getStatus().equals("1")) {
+                metaMap.put("isHide",true);
+            } else {
+                metaMap.put("isHide",false);
+            }
+            menu.setMeta(metaMap);
             // 存入节点映射
             nodeMap.put(menuId, menu);