From 18527527697736445172262921aeae7ea8c39de8 Mon Sep 17 00:00:00 2001 From: winter Date: Mon, 8 Jan 2024 15:33:02 +0800 Subject: [PATCH] fix --- .../iformall/controller/yqzj/YqzjNewsController.java | 10 ++++++++++ .../java/com/iformall/domain/po/yqzj/YqzjNews.java | 3 +++ .../src/main/resources/mapper/YqzjNewsMapper.xml | 7 +++++++ 3 files changed, 20 insertions(+) diff --git a/yqzjAdmin/src/main/java/com/iformall/controller/yqzj/YqzjNewsController.java b/yqzjAdmin/src/main/java/com/iformall/controller/yqzj/YqzjNewsController.java index cf5206d..9f0166f 100644 --- a/yqzjAdmin/src/main/java/com/iformall/controller/yqzj/YqzjNewsController.java +++ b/yqzjAdmin/src/main/java/com/iformall/controller/yqzj/YqzjNewsController.java @@ -37,6 +37,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -59,6 +60,15 @@ public class YqzjNewsController extends YqzjBaseController { @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData list(@ModelAttribute YqzjNews record, Integer pageNum, Integer pageSize) { record.setSortColumns(" first desc, update_date desc, send_date desc, create_date desc"); + if (null != record.getType()) { + if (EnumYqzjNewsType.YUNYUZHOU.getCode().intValue() == record.getType().intValue()) { + record.setType(null); + List typeList = new ArrayList(); + typeList.add(EnumYqzjNewsType.YUNYUZHOU_SHENDU.getCode()); + typeList.add(EnumYqzjNewsType.YUNYUZHOU_ZIXUN.getCode()); + record.setTypeList(typeList); + } + } final PageInfo page = this.yqzjService.listNewsAsPage(record, pageNum, pageSize); return new ResultData(page); } diff --git a/yqzjService/src/main/java/com/iformall/domain/po/yqzj/YqzjNews.java b/yqzjService/src/main/java/com/iformall/domain/po/yqzj/YqzjNews.java index c5877a1..323930a 100644 --- a/yqzjService/src/main/java/com/iformall/domain/po/yqzj/YqzjNews.java +++ b/yqzjService/src/main/java/com/iformall/domain/po/yqzj/YqzjNews.java @@ -7,6 +7,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; import java.util.Date; +import java.util.List; @TableName(value = "yqzj_news") @Data @@ -20,6 +21,8 @@ public class YqzjNews extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="EnumYqzjNewsType 类型",name="type") private Integer type; + @TableField(exist = false) + private List typeList; @io.swagger.annotations.ApiModelProperty(value="EnumYqzjNewsType 类型",name="subType") private Integer subType; @io.swagger.annotations.ApiModelProperty(value="标签",name="tag") diff --git a/yqzjService/src/main/resources/mapper/YqzjNewsMapper.xml b/yqzjService/src/main/resources/mapper/YqzjNewsMapper.xml index 141b52b..ede0031 100644 --- a/yqzjService/src/main/resources/mapper/YqzjNewsMapper.xml +++ b/yqzjService/src/main/resources/mapper/YqzjNewsMapper.xml @@ -71,6 +71,13 @@ and `first` = #{first} + + and type in + + #{tyItem} + + + and id in