diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml
index cfcee88..968d4fb 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml
+++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml
@@ -33,6 +33,12 @@
INNER JOIN
( SELECT * FROM biz_message_authorize WHERE user_id = #{userId}) b ON a.id = b.message_id
+
+ and biz_message.templatecode
+
+ #{item, jdbcType=NUMERIC}
+
+
ORDER BY createtime DESC
diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dto/PageDTO.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dto/PageDTO.java
index 91af3da..3c7fae0 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dto/PageDTO.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dto/PageDTO.java
@@ -3,6 +3,8 @@ package com.chinaunicom.mall.ebtp.extend.bizmessage.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.util.List;
+
/**
* 分页明细
*
@@ -26,4 +28,7 @@ public class PageDTO {
this.pageSize = 15;
}
+ @ApiModelProperty(required = false, value = "指定消息类型,null 查全部")
+ private List templatecodes;
+
}
diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/BizMessageVo.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/BizMessageVo.java
index b15db1b..ed16473 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/BizMessageVo.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/BizMessageVo.java
@@ -2,6 +2,8 @@ package com.chinaunicom.mall.ebtp.extend.bizmessage.entity;
import lombok.Data;
+import java.util.List;
+
@Data
public class BizMessageVo extends BizMessage{
@@ -11,4 +13,5 @@ public class BizMessageVo extends BizMessage{
private Long datanum;
private Integer size;
+ private List templatecodes;
}
diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/impl/BizMessageConsumerServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/impl/BizMessageConsumerServiceImpl.java
index 7028181..7bf9102 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/impl/BizMessageConsumerServiceImpl.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/impl/BizMessageConsumerServiceImpl.java
@@ -42,9 +42,9 @@ public class BizMessageConsumerServiceImpl implements BizMessageConsumerService
@Override
public IBizMessagePage listOutline(PageDTO page) {
page = createPageCondition(page);
+ IPage pageEntity = new Page(page.getPageNo(), page.getPageSize());
- IPage pageEntity = mapper.findMessageVo(new Page(page.getPageNo(), page.getPageSize()),
- service.getCacheUser().getUserId());
+ pageEntity = mapper.findMessageVo(pageEntity,service.getCacheUser().getUserId());
// DAT -> VO 转换
IBizMessagePage result = new BizMessagePage<>();