字典工具类

hx-tenant/src/main/java/com/fjhx/tenant/service/dict/DictTenantDataService.java

@@ -52,4 +52,8 @@ public interface DictTenantDataService extends BaseService<DictTenantData> {
     List<DictTenantDataVo> getList(DictTenantDataSelectDto dto);
 
     Map<String, List<DictTenantDataVo>> getAllDictMap();
+    /**
+     * 获取全部字典map
+     */
+    Map<String, Map<String, String>> getAllDictKVMap();
 }

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

@@ -158,4 +158,11 @@ public class DictTenantDataServiceImpl extends ServiceImpl<DictTenantDataMapper,
         return allDictMap;
     }
 
+
+    @Override
+    public Map<String, Map<String, String>> getAllDictKVMap() {
+        List<DictTenantDataVo> list = baseMapper.getList(new DictTenantDataSelectDto());
+        return list.stream().collect(Collectors.groupingBy(DictTenantData::getDictCode, Collectors.toMap(DictTenantData::getDictKey, DictTenantData::getDictValue)));
+    }
+
 }

hx-tenant/src/main/java/com/fjhx/tenant/utils/DictUtils.java

@@ -4,6 +4,7 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.extra.spring.SpringUtil;
 import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
 import com.fjhx.tenant.entity.dict.dto.DictTenantDataSelectDto;
+import com.fjhx.tenant.entity.dict.po.DictTenantData;
 import com.fjhx.tenant.entity.dict.vo.DictTenantDataVo;
 import com.fjhx.tenant.service.dict.DictTenantDataService;
 import com.ruoyi.common.constant.BaseSourceConstant;
@@ -40,4 +41,11 @@ public class DictUtils {
         DynamicDataSourceContextHolder.poll();
         return dictTenantDataServiceList;
     }
+
+    /**
+     * 获取全部字典map
+     */
+    public static Map<String, Map<String, String>> getAllDictKVMap() {
+       return dictTenantDataService.getAllDictKVMap();
+    }
 }

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java

@@ -124,6 +124,22 @@ public class SysRole extends BaseEntity {
      */
     private Long parentId;
 
+    /**
+     * 是否系统角色
+     */
+    private Integer isSystem;
+
+    //============================
+
+
+    public Integer getIsSystem() {
+        return isSystem;
+    }
+
+    public void setIsSystem(Integer isSystem) {
+        this.isSystem = isSystem;
+    }
+
     public Long getParentId() {
         return parentId;
     }

ruoyi-system/src/main/java/com/ruoyi/system/utils/UserUtil.java

@@ -116,6 +116,10 @@ public class UserUtil {
         return recursionRoles(getUserRoles(userId), 0);
     }
 
+    public static List<String> getUserRoleAndChildRoleKeys(Long userId) {
+        return getUserRoleAndChildRole(userId).stream().map(SysRole::getRoleKey).distinct().collect(Collectors.toList());
+    }
+
     /**
      * 递归角色以及子角色
      */

ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml

@@ -20,11 +20,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="updateTime"         column="update_time"           />
 		<result property="remark"             column="remark"                />
 		<result property="parentId"             column="parent_id"                />
+		<result property="isSystem"             column="is_system"                />
 	</resultMap>
 	
 	<sql id="selectRoleVo">
 	    select distinct r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.menu_check_strictly, r.dept_check_strictly,
-            r.status, r.del_flag, r.create_time, r.remark, r.tenant_id,r.authority_lv,r.parent_id
+            r.status, r.del_flag, r.create_time, r.remark, r.tenant_id,r.authority_lv,r.parent_id,r.is_system
         from sys_role r
 	        left join sys_user_role ur on ur.role_id = r.role_id
 	        left join sys_user u on u.user_id = ur.user_id