From 8b3ab9d4e87a960a867b59d4ab1259f1bea1af2b Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Mon, 8 Apr 2024 15:08:38 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=A4=9A=E8=AF=AD=E8=A8=80=E7=BF=BB?=
 =?UTF-8?q?=E8=AF=91=E5=89=8D=E7=BC=80=E5=8C=B9=E9=85=8D=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/system/controller/sys_config.go | 15 ++++++++++-----
 src/modules/system/controller/sys_dept.go   |  5 +++++
 src/modules/system/controller/sys_post.go   | 15 ++++++++++-----
 src/modules/system/controller/sys_role.go   |  9 +++++++--
 4 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/src/modules/system/controller/sys_config.go b/src/modules/system/controller/sys_config.go
index 1b7258e9..66ee2151 100644
--- a/src/modules/system/controller/sys_config.go
+++ b/src/modules/system/controller/sys_config.go
@@ -35,12 +35,17 @@ type SysConfigController struct {
 //
 // GET /list
 func (s *SysConfigController) List(c *gin.Context) {
-	querys := ctx.QueryMap(c)
-	data := s.sysConfigService.SelectConfigPage(querys)
-
-	rows := data["rows"].([]model.SysConfig)
-	// 闭包函数处理多语言
 	language := ctx.AcceptLanguage(c)
+	querys := ctx.QueryMap(c)
+	// 多语言值转key查询
+	if v, ok := querys["configName"]; ok && v != "" {
+		querys["configName"] = i18n.TFindKeyPrefix(language, "config", v.(string))
+	}
+
+	data := s.sysConfigService.SelectConfigPage(querys)
+	rows := data["rows"].([]model.SysConfig)
+
+	// 闭包函数处理多语言
 	converI18n := func(language string, arr *[]model.SysConfig) {
 		for i := range *arr {
 			(*arr)[i].ConfigName = i18n.TKey(language, (*arr)[i].ConfigName)
diff --git a/src/modules/system/controller/sys_dept.go b/src/modules/system/controller/sys_dept.go
index 6cb582ce..de9bbda6 100644
--- a/src/modules/system/controller/sys_dept.go
+++ b/src/modules/system/controller/sys_dept.go
@@ -49,6 +49,11 @@ func (s *SysDeptController) List(c *gin.Context) {
 		return
 	}
 
+	// 多语言值转key查询
+	if querys.DeptName != "" {
+		querys.DeptName = i18n.TFindKeyPrefix(language, "dept", querys.DeptName)
+	}
+
 	SysDeptController := model.SysDept{
 		DeptID:   querys.DeptID,
 		ParentID: querys.ParentID,
diff --git a/src/modules/system/controller/sys_post.go b/src/modules/system/controller/sys_post.go
index 53495e9b..3fcd0a85 100644
--- a/src/modules/system/controller/sys_post.go
+++ b/src/modules/system/controller/sys_post.go
@@ -35,12 +35,17 @@ type SysPostController struct {
 //
 // GET /list
 func (s *SysPostController) List(c *gin.Context) {
-	querys := ctx.QueryMap(c)
-	data := s.sysPostService.SelectPostPage(querys)
-
-	rows := data["rows"].([]model.SysPost)
-	// 闭包函数处理多语言
 	language := ctx.AcceptLanguage(c)
+	querys := ctx.QueryMap(c)
+	// 多语言值转key查询
+	if v, ok := querys["postName"]; ok && v != "" {
+		querys["postName"] = i18n.TFindKeyPrefix(language, "post", v.(string))
+	}
+
+	data := s.sysPostService.SelectPostPage(querys)
+	rows := data["rows"].([]model.SysPost)
+
+	// 闭包函数处理多语言
 	converI18n := func(language string, arr *[]model.SysPost) {
 		for i := range *arr {
 			(*arr)[i].PostName = i18n.TKey(language, (*arr)[i].PostName)
diff --git a/src/modules/system/controller/sys_role.go b/src/modules/system/controller/sys_role.go
index eaa9f0f4..a56b2e82 100644
--- a/src/modules/system/controller/sys_role.go
+++ b/src/modules/system/controller/sys_role.go
@@ -42,13 +42,18 @@ type SysRoleController struct {
 //
 // GET /list
 func (s *SysRoleController) List(c *gin.Context) {
+	language := ctx.AcceptLanguage(c)
 	querys := ctx.QueryMap(c)
+	// 多语言值转key查询
+	if v, ok := querys["roleName"]; ok && v != "" {
+		querys["roleName"] = i18n.TFindKeyPrefix(language, "role", v.(string))
+	}
+
 	dataScopeSQL := ctx.LoginUserToDataScopeSQL(c, "d", "")
 	data := s.sysRoleService.SelectRolePage(querys, dataScopeSQL)
-
 	rows := data["rows"].([]model.SysRole)
+
 	// 闭包函数处理多语言
-	language := ctx.AcceptLanguage(c)
 	converI18n := func(language string, arr *[]model.SysRole) {
 		for i := range *arr {
 			(*arr)[i].RoleName = i18n.TKey(language, (*arr)[i].RoleName)