From 23f1ee8cd1cc9dbb98ee1ccd6e28174369fa7f87 Mon Sep 17 00:00:00 2001
From: gx_ma <1773945958@qq.com>
Date: Thu, 26 Mar 2026 16:05:25 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E5=9B=BD=E9=99=85=E5=8C=96):=20=E5=AD=97?=
 =?UTF-8?q?=E5=85=B8=E6=8A=A5=E9=94=99=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/system/SysDictDataMapper.xml     | 11 ++++++++---
 .../resources/mapper/system/SysDictTypeMapper.xml     |  2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/springboot/fastbee-service/fastbee-system-service/src/main/resources/mapper/system/SysDictDataMapper.xml b/springboot/fastbee-service/fastbee-system-service/src/main/resources/mapper/system/SysDictDataMapper.xml
index e9468718..655a440d 100644
--- a/springboot/fastbee-service/fastbee-system-service/src/main/resources/mapper/system/SysDictDataMapper.xml
+++ b/springboot/fastbee-service/fastbee-system-service/src/main/resources/mapper/system/SysDictDataMapper.xml
@@ -8,6 +8,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<id     property="dictCode"   column="dict_code"   />
 		<result property="dictSort"   column="dict_sort"   />
 		<result property="dictLabel"  column="dict_label"  />
+		<result property="dictLabel_zh_CN"  column="dict_label_zh_cn"  />
+		<result property="dictLabel_en_US"  column="dict_label_en_us"  />
 		<result property="dictValue"  column="dict_value"  />
 		<result property="dictType"   column="dict_type"   />
 		<result property="cssClass"   column="css_class"   />
@@ -42,8 +44,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
 	
 	<select id="selectDictDataByType" parameterType="SysDictData" resultMap="SysDictDataResult">
-		<include refid="selectDictDataVo"/>
-		where status = '0' and dict_type = #{dictType} order by dict_sort asc
+		select d.dict_code, d.dict_sort, d.dict_label, t.zh_cn as dict_label_zh_cn, t.en_us as dict_label_en_us,
+			   d.dict_value, d.dict_type, d.css_class, d.list_class, d.is_default, d.status, d.create_by, d.create_time, d.remark
+		from sys_dict_data d
+				 left join sys_dict_data_translate t on d.dict_code = t.id
+		where d.status = 0 and d.dict_type = #{dictType} order by d.dict_sort asc
 	</select>
 	
 	<select id="selectDictLabel" resultType="String">
@@ -51,7 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		where dict_type = #{dictType} and dict_value = #{dictValue}
 	</select>
 	
-	<select id="selectDictDataById" parameterType="Long" resultMap="SysDictDataResult">
+	<select id="selectDictDataById" resultMap="SysDictDataResult">
 		select d.dict_code, d.dict_sort,
 			   case
 				   when #{language} = 'zh-CN' then d.dict_label
diff --git a/springboot/fastbee-service/fastbee-system-service/src/main/resources/mapper/system/SysDictTypeMapper.xml b/springboot/fastbee-service/fastbee-system-service/src/main/resources/mapper/system/SysDictTypeMapper.xml
index 3c38e036..6609dd24 100644
--- a/springboot/fastbee-service/fastbee-system-service/src/main/resources/mapper/system/SysDictTypeMapper.xml
+++ b/springboot/fastbee-service/fastbee-system-service/src/main/resources/mapper/system/SysDictTypeMapper.xml
@@ -61,7 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 				 left join sys_dict_type_translate t on d.dict_id = t.id
 	</select>
 	
-	<select id="selectDictTypeById" parameterType="Long" resultMap="SysDictTypeResult">
+	<select id="selectDictTypeById" resultMap="SysDictTypeResult">
 		select d.dict_id,
 			   case
 				   when #{language} = 'zh-CN' then d.dict_name