From f987769207a625ef908696471483de83ebaa9637 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Wed, 31 Jul 2024 10:38:33 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AD=97=E5=85=B8=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E8=8B=B1=E6=96=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/jero/common/system/vo/DictModel.java    | 4 ++++
 .../java/com/jero/modules/system/mapper/xml/SysDictMapper.xml | 2 +-
 .../jero/modules/system/service/impl/SysDictServiceImpl.java  | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/laws-base/laws-base-core/src/main/java/com/jero/common/system/vo/DictModel.java b/laws-base/laws-base-core/src/main/java/com/jero/common/system/vo/DictModel.java
index 20ba1601..a399c7c9 100644
--- a/laws-base/laws-base-core/src/main/java/com/jero/common/system/vo/DictModel.java
+++ b/laws-base/laws-base-core/src/main/java/com/jero/common/system/vo/DictModel.java
@@ -30,6 +30,10 @@ public class DictModel implements Serializable{
 	 * 字典文本
 	 */
 	private String text;
+	/**
+	 * 字典文本
+	 */
+	private String enText;
 	/**
 	 * 是否置灰（1：是 0：否）
 	 */
diff --git a/laws-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysDictMapper.xml b/laws-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysDictMapper.xml
index 837e53f3..227857f7 100644
--- a/laws-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysDictMapper.xml
+++ b/laws-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysDictMapper.xml
@@ -4,7 +4,7 @@
 
 	<!-- 通过字典code获取字典数据 -->
 	<select id="queryDictItemsByCode" parameterType="String"  resultType="com.jero.common.system.vo.DictModel">
-		   select s.item_value as "value",s.item_text as "text" from sys_dict_item s
+		   select s.item_value as "value",s.item_text as "text", s.en_name as "enText" from sys_dict_item s
 		   where dict_id = (select id from sys_dict where dict_code = #{code}) and del_flag = 0
 		   order by s.sort_order asc
 	</select>
diff --git a/laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java b/laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java
index 0a7c36f6..f25ac38e 100644
--- a/laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java
+++ b/laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java
@@ -99,6 +99,7 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
 				DictModel dictModel = new DictModel();
 				dictModel.setText(item.getItemText());
 				dictModel.setValue(item.getItemValue());
+				dictModel.setEnText(item.getEnName());
 				return dictModel;
 			}).collect(Collectors.toList());
 			res.put(d.getDictCode(), dictModelList);