From c9fc14e729f623614fb761da97ab56818d7725cd Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Mon, 26 Sep 2022 17:09:30 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=B7=BB=E5=8A=A0=E9=A2=9C?=
 =?UTF-8?q?=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dto/result/OftenUseFunctionListResultDTO.java  | 5 +++++
 .../src/main/resources/mapper/IcOftenUseFunctionDao.xml      | 5 +++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/result/OftenUseFunctionListResultDTO.java b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/result/OftenUseFunctionListResultDTO.java
index 73ff018a10..46698701ed 100644
--- a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/result/OftenUseFunctionListResultDTO.java
+++ b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/result/OftenUseFunctionListResultDTO.java
@@ -38,4 +38,9 @@ public class OftenUseFunctionListResultDTO implements Serializable {
      * 排序
      */
     private String sort;
+
+    /**
+     * 菜单颜色
+     */
+    private String color;
 }
diff --git a/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/IcOftenUseFunctionDao.xml b/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/IcOftenUseFunctionDao.xml
index 5f25af85fc..35d01fb929 100644
--- a/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/IcOftenUseFunctionDao.xml
+++ b/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/IcOftenUseFunctionDao.xml
@@ -15,7 +15,8 @@
             ic.MENU_ID,
             gm.url,
             gm.icon,
-            gl.field_value AS menuName
+            gl.field_value AS menuName,
+            gm.color
         FROM ic_often_use_function ic
         INNER JOIN gov_customer_menu gc ON (gc.TABLE_ID = ic.MENU_ID AND gc.DEL_FLAG = '0' AND ic.CUSTOMER_ID = gc.CUSTOMER_ID)
         INNER JOIN gov_menu gm ON (gc.TABLE_ID = gm.id AND gm.DEL_FLAG = 0 AND gm.SHOW_FLAG = 1)
@@ -24,4 +25,4 @@
           AND ic.USER_ID = #{userId}
         ORDER BY ic.SORT
     </select>
-</mapper>
\ No newline at end of file
+</mapper>