From 8b1063e2a440eab7194ab6e3076bcc25213d6348 Mon Sep 17 00:00:00 2001
From: zhangqinbin <181961702@qq.com>
Date: Sat, 2 Apr 2022 14:45:48 +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

---
 .../dao/mapper/BizMessageMapper.xml           | 22 +++++++++++++------
 .../bizmessage/entity/BizMessageVo.java       |  2 --
 2 files changed, 15 insertions(+), 9 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 fbd5075..18001c1 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
@@ -23,22 +23,30 @@
         FROM biz_message
         left join biz_message_template on biz_message.templatecode = biz_message_template.code
         WHERE authorize = 0
+        <if test="templatecodes!=null and templatecodes.size()>0 ">
+            and biz_message.templatecode in
+            <foreach item="item" collection="templatecodes" separator="," open="(" close=")" index="">
+                #{item, jdbcType=NUMERIC}
+            </foreach>
+        </if>
         <if test="userId!=null and userId!=''">
             UNION ALL
             SELECT a.*,IFNULL(b.state,1) as authorizestate
             FROM ( SELECT biz_message.*,biz_message_template.type as templatetype
             FROM biz_message
             left join biz_message_template on biz_message.templatecode = biz_message_template.code
-            WHERE authorize = 1) a
+            WHERE authorize = 1
+            <if test="templatecodes!=null and templatecodes.size()>0 ">
+                and biz_message.templatecode in
+                <foreach item="item" collection="templatecodes" separator="," open="(" close=")" index="">
+                    #{item, jdbcType=NUMERIC}
+                </foreach>
+            </if>
+            ) a
             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 in
-            <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/entity/BizMessageVo.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/BizMessageVo.java
index ed16473..346ab95 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
@@ -12,6 +12,4 @@ public class BizMessageVo extends BizMessage{
     private String userId;
     private Long datanum;
     private Integer size;
-
-    private List<String> templatecodes;
 }