Merge branch 'developer'

935090232@qq.com

2022-05-03 afe54403db87c5f04e841350c9312367e10de50f

 zq-erp/src/main/java/com/matrix/system/common/authority/DefaultAuthorityManager.java

@@ -1,6 +1,9 @@
package com.matrix.system.common.authority;

import cn.hutool.crypto.SecureUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
import com.matrix.core.constance.MatrixConstance;
import com.matrix.core.pojo.AjaxResult;
import com.matrix.core.tools.StringUtils;
@@ -13,6 +16,7 @@
import com.matrix.system.common.init.LocalCache;
import com.matrix.system.common.service.SysFunctionService;
import org.apache.commons.collections.CollectionUtils;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

@@ -154,12 +158,9 @@
        Map<String, Object> cachePowerMap = LocalCache.get(redisKey);

        if (Objects.nonNull(cachePowerMap)) {

            userFunction = (Map<String, SysFunction>) cachePowerMap.get(USERFUNCTION);

            menuFunction = (List<SysFunction>) cachePowerMap.get(MENUSFUNCTION);

            userUrlMapping = (List<String>) cachePowerMap.get(USER_URL_MAPPING);
            userFunction = JSONObject.parseObject(JSON.toJSONString( cachePowerMap.get(USERFUNCTION)), new TypeReference<Map<String, SysFunction>>(){});
            menuFunction = JSONObject.parseObject(JSON.toJSONString( cachePowerMap.get(MENUSFUNCTION)) ,new TypeReference<List<SysFunction>>(){});
            userUrlMapping =JSONObject.parseObject(JSON.toJSONString( cachePowerMap.get(USER_URL_MAPPING)) , new TypeReference<List<String>>(){});

        } else {
            // 获取用户所有权限