From d60151008305441b76ff97ee8705fd4b4545d831 Mon Sep 17 00:00:00 2001
From: zhangqinbin <181961702@qq.com>
Date: Sat, 2 Apr 2022 14:27:01 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E4=BF=A1=E6=81=AF=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=8E=A5=E5=8F=A3=20=E5=A2=9E=E5=8A=A0=E6=A0=B9?=
 =?UTF-8?q?=E6=8D=AE=E7=B1=BB=E5=9E=8B=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml  | 6 ++++++
 .../mall/ebtp/extend/bizmessage/dto/PageDTO.java            | 5 +++++
 .../mall/ebtp/extend/bizmessage/entity/BizMessageVo.java    | 3 +++
 .../service/impl/BizMessageConsumerServiceImpl.java         | 4 ++--
 4 files changed, 16 insertions(+), 2 deletions(-)

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
         </if>
+        <if test="templatecodes!=null and templatecodes.size()>0 ">
+           and biz_message.templatecode
+            <foreach item="item" collection="templatecodes" separator="," open="(" close=")" index="">
+                #{item, jdbcType=NUMERIC}
+            </foreach>
+        </if>
         ORDER BY createtime DESC
     </select>
 
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<String> 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<String> 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<DescribeSiteMsgVO> listOutline(PageDTO page) {
         page = createPageCondition(page);
+        IPage<BizMessageVo> pageEntity = new Page<BizMessageVo>(page.getPageNo(), page.getPageSize());
 
-        IPage<BizMessageVo> pageEntity = mapper.findMessageVo(new Page<BizMessageVo>(page.getPageNo(), page.getPageSize()),
-                service.getCacheUser().getUserId());
+        pageEntity = mapper.findMessageVo(pageEntity,service.getCacheUser().getUserId());
 
         // DAT -> VO 转换
         IBizMessagePage<DescribeSiteMsgVO> result = new BizMessagePage<>();