From c7606e3f92f9d7f64910f16d5a50d6578cf7b59c Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Tue, 21 Nov 2023 11:31:30 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=B7=B3=E8=BF=87l18n=E5=AD=97=E5=85=B8?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/system/controller/sys_dict_data.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/modules/system/controller/sys_dict_data.go b/src/modules/system/controller/sys_dict_data.go index 60a8fd4c..96ecd1e6 100644 --- a/src/modules/system/controller/sys_dict_data.go +++ b/src/modules/system/controller/sys_dict_data.go @@ -71,8 +71,10 @@ func (s *SysDictDataController) Info(c *gin.Context) { data := s.sysDictDataService.SelectDictDataByCode(dictCode) if data.DictCode == dictCode { // 处理多语言 - data.DictLabel = i18n.TKey(language, data.DictLabel) - data.Remark = i18n.TKey(language, data.Remark) + if !strings.Contains(data.DictType, "i18n") { + data.DictLabel = i18n.TKey(language, data.DictLabel) + data.Remark = i18n.TKey(language, data.Remark) + } c.JSON(200, result.OkData(data)) return } @@ -233,6 +235,9 @@ func (s *SysDictDataController) Export(c *gin.Context) { // 闭包函数处理多语言 converI18n := func(language string, arr *[]model.SysDictData) { for i := range *arr { + if strings.Contains((*arr)[i].DictType, "i18n") { + continue + } (*arr)[i].DictLabel = i18n.TKey(language, (*arr)[i].DictLabel) (*arr)[i].Remark = i18n.TKey(language, (*arr)[i].Remark) }