diff --git a/ruoyi-site/ruoyi-h5/doc/http/work.http b/ruoyi-site/ruoyi-h5/doc/http/work.http index 8404e36e5..1bbe003f1 100644 --- a/ruoyi-site/ruoyi-h5/doc/http/work.http +++ b/ruoyi-site/ruoyi-h5/doc/http/work.http @@ -1,3 +1,3 @@ ### 查询所有H5项目 -GET http://localhost:19200/h5/works/page?page=1&size=10&status=1&isTemplate=true +GET http://localhost:19200/h5/works/page?page=1&size=10&status=2&isTemplate=true Accept: application/json diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/config/PlusTenantLineHandler.java b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/config/PlusTenantLineHandler.java index 3dce83eac..5e363f160 100644 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/config/PlusTenantLineHandler.java +++ b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/config/PlusTenantLineHandler.java @@ -2,13 +2,13 @@ package com.luban.api.config; import cn.hutool.core.collection.ListUtil; import com.baomidou.mybatisplus.extension.plugins.handler.TenantLineHandler; +import com.dromara.md.form.utils.TenantHelper; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import net.sf.jsqlparser.expression.Expression; import net.sf.jsqlparser.expression.NullValue; import net.sf.jsqlparser.expression.StringValue; import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.tenant.helper.TenantHelper; import org.dromara.common.tenant.properties.TenantProperties; import java.util.List; @@ -31,7 +31,7 @@ public class PlusTenantLineHandler implements TenantLineHandler { @Override public Expression getTenantId() { - String tenantId = TenantHelper.getTenantId(); + String tenantId = TenantHelper.getTenantId() + ""; if (StringUtils.isBlank(tenantId)) { log.error("无法获取有效的租户id -> Null"); return new NullValue(); @@ -42,7 +42,7 @@ public class PlusTenantLineHandler implements TenantLineHandler { @Override public boolean ignoreTable(String tableName) { - String tenantId = TenantHelper.getTenantId(); + String tenantId = TenantHelper.getTenantId() + ""; // 判断是否有租户 if (StringUtils.isNotBlank(tenantId)) { // 不需要过滤租户的表 diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dto/query/H5ProjectQueryDTO.java b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dto/query/H5ProjectQueryDTO.java index 5bfc22f07..6f867e6d8 100644 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dto/query/H5ProjectQueryDTO.java +++ b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dto/query/H5ProjectQueryDTO.java @@ -23,6 +23,9 @@ public class H5ProjectQueryDTO extends PageDtoBase { @Schema(description = "项目标题") private String title; + @Schema(description = "type") + private String type; + @Schema(description = "是否发布") private Integer status; diff --git a/ruoyi-site/ruoyi-h5/src/main/resources/mapper/ruoyi-h5/H5ProjectMapper.xml b/ruoyi-site/ruoyi-h5/src/main/resources/mapper/ruoyi-h5/H5ProjectMapper.xml index e56b54c51..30da07285 100644 --- a/ruoyi-site/ruoyi-h5/src/main/resources/mapper/ruoyi-h5/H5ProjectMapper.xml +++ b/ruoyi-site/ruoyi-h5/src/main/resources/mapper/ruoyi-h5/H5ProjectMapper.xml @@ -20,6 +20,7 @@