From a63aae66502333bb407e02410c1cc563d149f8fc Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Fri, 27 May 2022 09:58:58 +0800
Subject: [PATCH] caidan

---
 .../epmet/commons/tools/redis/RedisKeys.java  |  4 +--
 .../main/java/com/epmet/dto/GovMenuDTO.java   | 31 -------------------
 .../src/main/resources/mapper/GovMenuDao.xml  |  4 +--
 3 files changed, 4 insertions(+), 35 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 b03c25ff41..cbd38cb287 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
@@ -745,7 +745,7 @@ public class RedisKeys {
 	}
 
 	public static String getCustomerMenuList(String customerId, Integer type, String tableName) {
-		return getCustomerMenuListPrefix().concat(customerId).concat(":type:").concat(type.toString()).concat(":tableName:").concat(tableName);
+		return getCustomerMenuListPrefix().concat("type:").concat(type.toString()).concat(":tableName:").concat(tableName).concat(customerId);
 	}
 
 	/**
@@ -753,7 +753,7 @@ public class RedisKeys {
 	 * @return
 	 */
 	public static String getCustomerMenuListPrefix() {
-		return rootPrefix.concat("gov:access:nav:customerId:");
+		return rootPrefix.concat("gov:access:nav:");
 	}
 
 	/**
diff --git a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/GovMenuDTO.java b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/GovMenuDTO.java
index a82f78d877..91ef00b75a 100644
--- a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/GovMenuDTO.java
+++ b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/GovMenuDTO.java
@@ -22,7 +22,6 @@ import com.epmet.dto.result.MenuResourceDTO;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Date;
 import java.util.List;
 
 
@@ -77,36 +76,6 @@ public class GovMenuDTO extends TreeStringNode<GovMenuDTO> implements Serializab
      */
 	private Integer sort;
 
-	/**
-	 * 删除标识：0.未删除 1.已删除
-	 */
-	private Integer delFlag;
-
-	/**
-	 * 乐观锁
-	 */
-	private Integer revision;
-
-	/**
-	 * 创建人
-	 */
-	private String createdBy;
-
-	/**
-	 * 创建时间
-	 */
-	private Date createdTime;
-
-	/**
-	 * 更新人
-	 */
-	private String updatedBy;
-
-	/**
-	 * 更新时间
-	 */
-	private Date updatedTime;
-
 	/**
 	 * 菜单资源
 	 */
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 d517aa8939..6bc815e44d 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
@@ -47,8 +47,8 @@
         select t1.*,
         lang.field_value name
         from gov_menu t1
-        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
+        INNER join gov_language lang on lang.table_name=#{tableName} and lang.field_name='name' and lang.table_id=t1.id and lang.language=#{language}
+        RIGHT 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}