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 + + and biz_message.templatecode in + + #{item, jdbcType=NUMERIC} + + 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 + + and biz_message.templatecode in + + #{item, jdbcType=NUMERIC} + + + ) a INNER JOIN ( SELECT * FROM biz_message_authorize WHERE user_id = #{userId}) b ON a.id = b.message_id - - and biz_message.templatecode in - - #{item, jdbcType=NUMERIC} - - + ORDER BY createtime DESC 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 templatecodes; }