From aeba5fdd24b1005237751812799ce1629fc66012 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Fri, 27 May 2022 09:35:27 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E8=8F=9C=E5=8D=95=E6=97=B6?=
 =?UTF-8?q?=20=E4=BD=BF=E7=94=A8inner=20=E8=BF=87=E6=BB=A4=E6=8E=89?=
 =?UTF-8?q?=E5=90=8D=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/commons/tools/redis/RedisKeys.java | 2 +-
 .../src/main/resources/mapper/GovMenuDao.xml               | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java
index 412b4b7237..b03c25ff41 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java
@@ -753,7 +753,7 @@ public class RedisKeys {
 	 * @return
 	 */
 	public static String getCustomerMenuListPrefix() {
-		return rootPrefix.concat("oper:access:nav:customerId:");
+		return rootPrefix.concat("gov:access:nav:customerId:");
 	}
 
 	/**
diff --git a/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/GovMenuDao.xml b/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/GovMenuDao.xml
index d28dc643cb..d517aa8939 100644
--- a/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/GovMenuDao.xml
+++ b/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/GovMenuDao.xml
@@ -44,10 +44,11 @@
     </select>
 
     <select id="getCustomerMenuList" resultType="com.epmet.entity.GovMenuEntity">
-        select t1.*, (select lang.field_value from gov_language lang where lang.table_name=#{tableName} and lang.field_name='name'
-        and lang.table_id=t1.id and lang.language=#{language}) as name
+        select t1.*,
+        lang.field_value name
         from gov_menu t1
-        RIGHT JOIN gov_customer_menu m ON t1.id = m.TABLE_ID
+        inner join gov_language lang on lang.table_name=#{tableName} and lang.field_name='name'
+        INNER JOIN gov_customer_menu m ON t1.id = m.TABLE_ID
         where t1.del_flag = 0 AND m.del_flag = 0
         <if test="type != null">
             and t1.type = #{type}