diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/impl/DecorateTabbarServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/DecorateTabbarServiceImpl.java index cf4fb0b9..e15cb1bf 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/impl/DecorateTabbarServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/DecorateTabbarServiceImpl.java @@ -1,6 +1,7 @@ package com.mdd.admin.service.impl; import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONArray; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.mdd.admin.service.IDecorateTabbarService; import com.mdd.admin.validate.DecorateTabsValidate; @@ -45,7 +46,7 @@ public class DecorateTabbarServiceImpl implements IDecorateTabbarService { vo.setName(tab.getName()); vo.setSelected(UrlUtil.toAbsoluteUrl(tab.getSelected())); vo.setUnselected(UrlUtil.toAbsoluteUrl(tab.getUnselected())); - vo.setLink(tab.getLink()); + vo.setLink(JSON.parse(tab.getLink())); vo.setCreateTime(TimeUtil.timestampToDate(tab.getCreateTime())); vo.setUpdateTime(TimeUtil.timestampToDate(tab.getUpdateTime())); tabList.add(vo); @@ -71,10 +72,9 @@ public class DecorateTabbarServiceImpl implements IDecorateTabbarService { decorateTabbarMapper.delete(new QueryWrapper().gt("id", 0)); for (DecorateTabsListsVo obj : tabsValidate.getList()) { - DecorateTabbar model = new DecorateTabbar(); model.setName(obj.getName()); - model.setLink(obj.getLink()); + model.setLink(JSON.toJSONString(obj.getLink())); model.setSelected(UrlUtil.toRelativeUrl(obj.getSelected())); model.setUnselected(UrlUtil.toRelativeUrl(obj.getUnselected())); model.setCreateTime(System.currentTimeMillis() / 1000); diff --git a/server/like-admin/src/main/java/com/mdd/admin/vo/decorate/DecorateTabsListsVo.java b/server/like-admin/src/main/java/com/mdd/admin/vo/decorate/DecorateTabsListsVo.java index b48373d4..5e7cc32f 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/vo/decorate/DecorateTabsListsVo.java +++ b/server/like-admin/src/main/java/com/mdd/admin/vo/decorate/DecorateTabsListsVo.java @@ -18,7 +18,7 @@ public class DecorateTabsListsVo implements Serializable { private String name; private String selected; private String unselected; - private String link; + private Object link; private String createTime; private String updateTime;