1

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDictDataMapper.java

@@ -1,6 +1,8 @@
 package org.dromara.system.mapper;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import org.apache.ibatis.annotations.Param;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 import org.dromara.system.domain.SysDictData;
 import org.dromara.system.domain.vo.SysDictDataVo;
@@ -28,4 +30,7 @@ public interface SysDictDataMapper extends BaseMapperPlus<SysDictData, SysDictDa
                 .eq(SysDictData::getTenantId, tenantId)
                 .orderByAsc(SysDictData::getDictSort));
     };
+
+    @InterceptorIgnore(tenantLine = "true")
+    List<SysDictDataVo> dictTypeTenantIdMapper(@Param("dictType")String dictType, @Param("tenantId")String tenantId);
 }

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java

@@ -212,7 +212,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService, DictService
     //@Cacheable(cacheNames = CacheNames.SYS_DICT, key = "#dictType")
     @Override
     public List<SysDictDataVo> dictTypeTenantId(String dictType, String tenantId) {
-        List<SysDictDataVo> dictDatas = dictDataMapper.dictTypeTenantId(dictType,tenantId);
+        List<SysDictDataVo> dictDatas = dictDataMapper.dictTypeTenantIdMapper(dictType,tenantId);
         if (CollUtil.isNotEmpty(dictDatas)) {
             return dictDatas;
         }

ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml

@@ -3,5 +3,19 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.dromara.system.mapper.SysDictDataMapper">
+    <resultMap type="org.dromara.system.domain.vo.SysDictDataVo" id="SysDictDeptResult">
+    </resultMap>
+
+    <sql id="selectDictDeptVo">
+        SELECT dict_code, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, remark, tenant_id, create_dept, create_by, create_time, update_by, update_time
+        FROM sys_dict_data
+    </sql>
+
+    <select id="dictTypeTenantIdMapper" resultMap="SysDictDeptResult">
+        <include refid="selectDictDeptVo"/>
+        WHERE dict_type = #{dictType} AND tenant_id = #{tenantId}
+        ORDER BY dict_sort ASC
+    </select>
+
 
 </mapper>