diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysCatalogResourceVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysCatalogResourceVo.java index 380268a..b1e4389 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysCatalogResourceVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysCatalogResourceVo.java @@ -62,6 +62,7 @@ public class SysCatalogResourceVo implements Serializable { @Translation(type = TransConstant.OSS_ID_TO_URL) @AutoMapping(target = "cover") private Long coverUrl; + /** * 资源数量 */ diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysHomeTrendVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysHomeTrendVo.java index bb5fd0c..0cc8c5c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysHomeTrendVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysHomeTrendVo.java @@ -2,6 +2,8 @@ package org.dromara.system.domain.vo; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; +import org.dromara.common.translation.annotation.Translation; +import org.dromara.common.translation.constant.TransConstant; import org.dromara.system.domain.SysHomeTrend; import java.io.Serial; @@ -58,6 +60,8 @@ public class SysHomeTrendVo implements Serializable { */ private Integer status; - private Date createTime; + + @Translation(type = TransConstant.USER_ID_TO_NAME) + private Long createBy; } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysCatalogResourceMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysCatalogResourceMapper.java index b69970a..4d572ff 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysCatalogResourceMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysCatalogResourceMapper.java @@ -16,5 +16,6 @@ import org.dromara.system.domain.vo.SysCatalogResourceVo; */ @Mapper public interface SysCatalogResourceMapper extends BaseMapperPlus { - Page selectPageUserList(@Param("page") Page page, @Param("catalogId") Long catalogId); + Page selectPageList(@Param("page") Page page, @Param("catalogId") Long catalogId); + Page selectProtalPageList(@Param("page") Page page); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysCatalogResourceServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysCatalogResourceServiceImpl.java index 984e907..e6dafb8 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysCatalogResourceServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysCatalogResourceServiceImpl.java @@ -71,18 +71,20 @@ public class SysCatalogResourceServiceImpl implements ISysCatalogResourceService /** * 管理使用 + * * @param bo 查询条件 * @param pageQuery 分页参数 * @return */ @Override public TableDataInfo queryPageList(SysCatalogResourceBo bo, PageQuery pageQuery) { - Page result = baseMapper.selectPageUserList(pageQuery.build(), bo.getCatalogId()); + Page result = baseMapper.selectPageList(pageQuery.build(), bo.getCatalogId()); return TableDataInfo.build(result); } /** * 门户使用 + * * @param bo 查询条件 * @param pageQuery 分页参数 * @return @@ -97,7 +99,7 @@ public class SysCatalogResourceServiceImpl implements ISysCatalogResourceService private LambdaQueryWrapper buildQueryWrapper(SysCatalogResourceBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.eq(bo.getParentId() != null, SysCatalogResource::getParentId, bo.getParentId()); + lqw.like(bo.getParentId() != null, SysCatalogResource::getAncestors, bo.getParentId()); lqw.eq(bo.getType() != null, SysCatalogResource::getType, bo.getType()); return lqw; } diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysCatalogResourceMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysCatalogResourceMapper.xml index 51fd500..f4e8f85 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysCatalogResourceMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysCatalogResourceMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - select cr.catalog_id,cr.parent_id, cr.catalog_name, cr.order_num, count(sor.oss_id) as `resourceNum` from sys_catalog_resource cr left join sys_oss_resource sor on sor.catalog_id = cr.catalog_id @@ -13,4 +13,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" having cr.parent_id = #{catalogId} order by cr.order_num + +