From 8b43d7c9916278acaa3ecdd0aee5ec6124d6159d Mon Sep 17 00:00:00 2001
From: gxwebsoft <Websoft5386339>
Date: Sun, 5 May 2024 02:57:08 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=BB=E5=8F=96=E5=B0=8F=E7=A8=8B=E5=BA=8F?=
 =?UTF-8?q?=E5=AF=BC=E8=88=AA=E5=9B=BE=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gxwebsoft/cms/controller/WebsiteController.java    | 10 ++++++----
 src/main/java/com/gxwebsoft/cms/entity/Website.java    |  4 ++++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/gxwebsoft/cms/controller/WebsiteController.java b/src/main/java/com/gxwebsoft/cms/controller/WebsiteController.java
index fb18984..88492d5 100644
--- a/src/main/java/com/gxwebsoft/cms/controller/WebsiteController.java
+++ b/src/main/java/com/gxwebsoft/cms/controller/WebsiteController.java
@@ -7,10 +7,7 @@ import cn.hutool.http.HttpRequest;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.gxwebsoft.cms.entity.*;
-import com.gxwebsoft.cms.param.AdParam;
-import com.gxwebsoft.cms.param.ArticleCategoryParam;
-import com.gxwebsoft.cms.param.NavigationParam;
-import com.gxwebsoft.cms.param.WebsiteParam;
+import com.gxwebsoft.cms.param.*;
 import com.gxwebsoft.cms.service.*;
 import com.gxwebsoft.common.core.security.JwtUtil;
 import com.gxwebsoft.common.core.utils.RedisUtil;
@@ -69,6 +66,8 @@ public class WebsiteController extends BaseController {
     private MerchantService merchantService;
     @Resource
     private MerchantAccountService merchantAccountService;
+    @Resource
+    private MpMenuService mpMenuService;
 
     @ApiOperation("获取网站信息")
     @GetMapping("/getSiteInfo")
@@ -211,6 +210,9 @@ public class WebsiteController extends BaseController {
 
       // 附加自定义字段
       website.setFields(websiteFieldService.list());
+      // 小程序端导航图标
+      final MpMenuParam mpMenuParam = new MpMenuParam();
+      website.setMpMenus(mpMenuService.listRel(mpMenuParam));
 
       // 附加自定义导航
       final NavigationParam navigationParam = new NavigationParam();
diff --git a/src/main/java/com/gxwebsoft/cms/entity/Website.java b/src/main/java/com/gxwebsoft/cms/entity/Website.java
index b880264..a605d89 100644
--- a/src/main/java/com/gxwebsoft/cms/entity/Website.java
+++ b/src/main/java/com/gxwebsoft/cms/entity/Website.java
@@ -137,6 +137,10 @@ public class Website implements Serializable {
     @TableField(exist = false)
     private List<WebsiteField> fields;
 
+    @ApiModelProperty(value = "小程序导航图标")
+    @TableField(exist = false)
+    private List<MpMenu> mpMenus;
+
     @ApiModelProperty(value = "网站导航栏")
     @TableField(exist = false)
     private List<Navigation> navigations;