|
|
@@ -1,5 +1,7 @@
|
|
|
package thyyxxk.webserver.service.settings;
|
|
|
|
|
|
+import com.alibaba.fastjson.JSONArray;
|
|
|
+import com.alibaba.fastjson.JSONObject;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import lombok.RequiredArgsConstructor;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
@@ -88,10 +90,12 @@ public class MenuSettingsService {
|
|
|
private List<IntergrationMenu> getRedisMenuByCode(String code) {
|
|
|
UserInfo userInfo = cache.get(code);
|
|
|
List<IntergrationMenu> menuList = extraCache.getValue(CacheEnums.MENU, dao::getAll);
|
|
|
+
|
|
|
+ menuList = JSONArray.parseArray(JSONObject.toJSONString(menuList), IntergrationMenu.class);
|
|
|
+
|
|
|
if (userInfo.getRoles().contains(1)) {
|
|
|
return menuList;
|
|
|
}
|
|
|
-
|
|
|
List<IntergrationMenu> passRule = new ArrayList<>();
|
|
|
for (IntergrationMenu item : menuList) {
|
|
|
if (item.getMetaPassRule()) {
|
