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 fields; + @ApiModelProperty(value = "小程序导航图标") + @TableField(exist = false) + private List mpMenus; + @ApiModelProperty(value = "网站导航栏") @TableField(exist = false) private List navigations;