From 3fc37924f66f4e5bfb32624281f79e04e60f4496 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Fri, 17 Nov 2023 10:15:19 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=AD=97=E5=85=B8=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E7=A9=BA=E5=AD=97=E7=AC=A6=E4=B8=B2=E5=AD=98=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/common/service/commont.go | 2 +- src/modules/common/service/commont.impl.go | 4 ++-- src/modules/system/repository/sys_dict_data.impl.go | 12 +++--------- src/modules/system/repository/sys_dict_type.impl.go | 4 +--- 4 files changed, 7 insertions(+), 15 deletions(-) diff --git a/src/modules/common/service/commont.go b/src/modules/common/service/commont.go index 5dc1e658..e8be8db3 100644 --- a/src/modules/common/service/commont.go +++ b/src/modules/common/service/commont.go @@ -3,5 +3,5 @@ package service // 通用请求 服务层接口 type ICommont interface { // SystemConfigInfo 系统配置信息 - SystemConfigInfo() map[string]any + SystemConfigInfo() map[string]string } diff --git a/src/modules/common/service/commont.impl.go b/src/modules/common/service/commont.impl.go index 41972980..3756a168 100644 --- a/src/modules/common/service/commont.impl.go +++ b/src/modules/common/service/commont.impl.go @@ -19,8 +19,8 @@ type CommontImpl struct { } // SystemConfigInfo 系统配置信息 -func (s *CommontImpl) SystemConfigInfo() map[string]any { - infoMap := map[string]any{} +func (s *CommontImpl) SystemConfigInfo() map[string]string { + infoMap := map[string]string{} // 获取LOGO类型 logoType := s.sysConfigService.SelectConfigValueByKey("sys.logo.type") infoMap["logoType"] = logoType diff --git a/src/modules/system/repository/sys_dict_data.impl.go b/src/modules/system/repository/sys_dict_data.impl.go index 0664cb0a..ab1440d6 100644 --- a/src/modules/system/repository/sys_dict_data.impl.go +++ b/src/modules/system/repository/sys_dict_data.impl.go @@ -314,18 +314,12 @@ func (r *SysDictDataImpl) UpdateDictData(sysDictData model.SysDictData) int64 { if sysDictData.DictType != "" { params["dict_type"] = sysDictData.DictType } - if sysDictData.TagClass != "" { - params["tag_class"] = sysDictData.TagClass - } - if sysDictData.TagType != "" { - params["tag_type"] = sysDictData.TagType - } if sysDictData.Status != "" { params["status"] = sysDictData.Status } - if sysDictData.Remark != "" { - params["remark"] = sysDictData.Remark - } + params["tag_class"] = sysDictData.TagClass + params["tag_type"] = sysDictData.TagType + params["remark"] = sysDictData.Remark if sysDictData.UpdateBy != "" { params["update_by"] = sysDictData.UpdateBy params["update_time"] = time.Now().UnixMilli() diff --git a/src/modules/system/repository/sys_dict_type.impl.go b/src/modules/system/repository/sys_dict_type.impl.go index e34ab7ba..3333263f 100644 --- a/src/modules/system/repository/sys_dict_type.impl.go +++ b/src/modules/system/repository/sys_dict_type.impl.go @@ -298,9 +298,7 @@ func (r *SysDictTypeImpl) UpdateDictType(sysDictType model.SysDictType) int64 { if sysDictType.Status != "" { params["status"] = sysDictType.Status } - if sysDictType.Remark != "" { - params["remark"] = sysDictType.Remark - } + params["remark"] = sysDictType.Remark if sysDictType.UpdateBy != "" { params["update_by"] = sysDictType.UpdateBy params["update_time"] = time.Now().UnixMilli()