Merge remote-tracking branch 'origin/dev' into dev

sckw-common/sckw-common-stream/src/main/java/com/sckw/stream/enums/MessageEnum.java

@@ -1,8 +1,14 @@
 package com.sckw.stream.enums;
 
+import com.sckw.core.utils.CollectionUtils;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
+import java.util.Arrays;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
 /**
  * @author zk
  * @description 短信模板
@@ -108,38 +114,38 @@ public enum MessageEnum {
     /**
      * 合作申请待审核
      */
-    COOPERATE_WAIT_APPROVAL("BUSINESS", "COOPERATE_WAIT_APPROVAL", "合作申请待审核", "【${entName}】对贵司发起了企业合作申请，请前往确认","terminal,ios,android",""),
+    COOPERATE_WAIT_APPROVAL("BUSINESS", "COOPERATE_WAIT_APPROVAL", "合作申请待审核", "【${entName}】对贵司发起了企业合作申请，请前往确认", "terminal,ios,android", ""),
 
     /**
      * 合作申请审核通过
      */
-    COOPERATE_PASS("BUSINESS", "COOPERATE_PASS", "合作申请审核通过", "贵司发起的与【${entName}有限公司】的合作申请，已通过", "terminal,ios,android",""),
+    COOPERATE_PASS("BUSINESS", "COOPERATE_PASS", "合作申请审核通过", "贵司发起的与【${entName}有限公司】的合作申请，已通过", "terminal,ios,android", ""),
 
 
     /**
      * 合作申请审核驳回
      */
-    COOPERATE_REFUSED("BUSINESS", "COOPERATE_REFUSED", "合作申请审核驳回", "贵司发起的与【${entName}有限公司】的合作申请，已驳回，请及时确认", "terminal,ios,android",""),
+    COOPERATE_REFUSED("BUSINESS", "COOPERATE_REFUSED", "合作申请审核驳回", "贵司发起的与【${entName}有限公司】的合作申请，已驳回，请及时确认", "terminal,ios,android", ""),
 
     /**
      * 解除合作关系
      */
-    COOPERATE_DISSOLVE("BUSINESS", "COOPERATE_DISSOLVE", "解除合作关系", "贵司解除了与【${entName}】的合作关系，请及时通知合作单位；操作人：${createByName}", "terminal,ios,android",""),
+    COOPERATE_DISSOLVE("BUSINESS", "COOPERATE_DISSOLVE", "解除合作关系", "贵司解除了与【${entName}】的合作关系，请及时通知合作单位；操作人：${createByName}", "terminal,ios,android", ""),
 
     /**
      * 合作关系被解除
      */
-    COOPERATE_DISSOLVED("BUSINESS", "COOPERATE_DISSOLVED", "合作关系被解除", "【${entName}】解除了与贵司的合作关系，请及时联系合作范围并确认", "terminal,ios,android",""),
+    COOPERATE_DISSOLVED("BUSINESS", "COOPERATE_DISSOLVED", "合作关系被解除", "【${entName}】解除了与贵司的合作关系，请及时联系合作范围并确认", "terminal,ios,android", ""),
 
     /**
      * 恢复合作关系
      */
-    COOPERATE_RESTORE("BUSINESS", "COOPERATE_RESTORE", "恢复合作关系", "贵司恢复了与【${entName}有限公司】的合作关系，请及时通知合作单位；操作人：${createByName}", "terminal,ios,android",""),
+    COOPERATE_RESTORE("BUSINESS", "COOPERATE_RESTORE", "恢复合作关系", "贵司恢复了与【${entName}有限公司】的合作关系，请及时通知合作单位；操作人：${createByName}", "terminal,ios,android", ""),
 
     /**
      * 合作关系被恢复
      */
-    COOPERATE_RESTORED("BUSINESS", "COOPERATE_RESTORED", "合作关系被恢复", "【${entName}有限公司】恢复了与贵司的合作关系，请及时联系合作范围并确认", "terminal,ios,android",""),
+    COOPERATE_RESTORED("BUSINESS", "COOPERATE_RESTORED", "合作关系被恢复", "【${entName}有限公司】恢复了与贵司的合作关系，请及时联系合作范围并确认", "terminal,ios,android", ""),
 
     /**
      * 托运订单-发起物流托运
@@ -208,92 +214,92 @@ public enum MessageEnum {
      * 销售、采购对账
      */
     LEDGER_SELL("BUSINESS", "BUSINESS_LEDGER_SELL", "发起销售对账",
-            "贵司发起了对【${company}】的贸易对账，请留意后续消息；对账单号：${number}，对账单名称：${name}", "terminal,ios,android",""),
+            "贵司发起了对【${company}】的贸易对账，请留意后续消息；对账单号：${number}，对账单名称：${name}", "terminal,ios,android", ""),
     LEDGER_PURCHASE("BUSINESS", "BUSINESS_LEDGER_PURCHASE", "发起销售对账",
-            "【${company}】对贵司发起了贸易对账确认操作，请及时查看；对账单号：${number}，对账单名称：${name}", "terminal,ios,android",""),
+            "【${company}】对贵司发起了贸易对账确认操作，请及时查看；对账单号：${number}，对账单名称：${name}", "terminal,ios,android", ""),
     LEDGER_REVOCATION_SELL("BUSINESS", "BUSINESS_LEDGER_REVOCATION_SELL", "撤回对账",
-            "贵司撤回了与【${company}】的贸易对账，请及时确认并联系往来单位；对账单号：${number}，对账单名称：${name}", "terminal,ios,android",""),
+            "贵司撤回了与【${company}】的贸易对账，请及时确认并联系往来单位；对账单号：${number}，对账单名称：${name}", "terminal,ios,android", ""),
     LEDGER_REVOCATION_PURCHASE("BUSINESS", "BUSINESS_LEDGER_REVOCATION_PURCHASE", "撤回对账",
-            "贵司撤回了与【${company}】的贸易对账，请及时确认并联系往来单位；对账单号：${number}，对账单名称：${name}", "terminal,ios,android",""),
+            "贵司撤回了与【${company}】的贸易对账，请及时确认并联系往来单位；对账单号：${number}，对账单名称：${name}", "terminal,ios,android", ""),
 
     LEDGER_CONFIRM_SELL("BUSINESS", "BUSINESS_LEDGER_CONFIRM_SELL", "对账申请审核通过",
-            "贵司对【${company}】发起的贸易对账申请已审核通过，请及时确认；对账单号：${number}，对账单名称：${name}", "terminal,ios,android",""),
+            "贵司对【${company}】发起的贸易对账申请已审核通过，请及时确认；对账单号：${number}，对账单名称：${name}", "terminal,ios,android", ""),
     LEDGER_CONFIRM_PURCHASE("BUSINESS", "BUSINESS_LEDGER_CONFIRM_PURCHASE", "对账申请审核通过",
-            "【${company}】发起的对账申请，贵司已审核通过，请确认；对账单号：${number}，对账单名称：${name}", "terminal,ios,android",""),
+            "【${company}】发起的对账申请，贵司已审核通过，请确认；对账单号：${number}，对账单名称：${name}", "terminal,ios,android", ""),
 
     LEDGER_SUCCESS_SELL("BUSINESS", "BUSINESS_LEDGER_SUCCESS_SELL", "销售对账完成",
-            "贵司完成了与【${company}】的对账，系统生成了结算单，请及时确认；对账单号：${number}，对账单名称：${name}", "terminal,ios,android",""),
+            "贵司完成了与【${company}】的对账，系统生成了结算单，请及时确认；对账单号：${number}，对账单名称：${name}", "terminal,ios,android", ""),
     LEDGER_SUCCESS_PURCHASE("BUSINESS", "BUSINESS_LEDGER_SUCCESS_PURCHASE", "销售对账完成",
-            "【${company}】已完成对账流程，系统生成了结算单，请及时确认；对账单号：${number}，对账单名称：${name}", "terminal,ios,android",""),
+            "【${company}】已完成对账流程，系统生成了结算单，请及时确认；对账单号：${number}，对账单名称：${name}", "terminal,ios,android", ""),
 
     LEDGER_BACK_SELL("BUSINESS", "BUSINESS_LEDGER_BACK_SELL", "付款方驳回对账申请",
-            "贵司的贸易对账申请被【${company}】驳回，请及时查看；对账单号：${number}，对账单名称：${name}", "terminal,ios,android",""),
+            "贵司的贸易对账申请被【${company}】驳回，请及时查看；对账单号：${number}，对账单名称：${name}", "terminal,ios,android", ""),
     LEDGER_BACK_PURCHASE("BUSINESS", "BUSINESS_LEDGER_BACK_PURCHASE", "付款方驳回对账申请",
-            "贵司驳回了与【${company}】的贸易对账，请及时确认；对账单号：${number}，对账单名称：${name}", "terminal,ios,android",""),
+            "贵司驳回了与【${company}】的贸易对账，请及时确认；对账单号：${number}，对账单名称：${name}", "terminal,ios,android", ""),
     /**
      * 承运、托运对账
      */
     LEDGER_CARRIER("BUSINESS", "BUSINESS_LEDGER_CARRIER", "发起销售对账",
-            "贵司发起了对【${company}】的物流对账，请留意后续消息；对账单号：${number}，对账单名称：${name}", "terminal,ios,android",""),
+            "贵司发起了对【${company}】的物流对账，请留意后续消息；对账单号：${number}，对账单名称：${name}", "terminal,ios,android", ""),
     LEDGER_SHIPPER("BUSINESS", "BUSINESS_LEDGER_SHIPPER", "发起销售对账",
-            "【${company}】对贵司发起了物流对账确认操作，请及时查看；对账单号：${number}，对账单名称：${name}", "terminal,ios,android",""),
+            "【${company}】对贵司发起了物流对账确认操作，请及时查看；对账单号：${number}，对账单名称：${name}", "terminal,ios,android", ""),
     LEDGER_REVOCATION_CARRIER("BUSINESS", "BUSINESS_LEDGER_REVOCATION_CARRIER", "撤回对账",
-            "贵司撤回了与【${company}】的物流对账，请及时确认并联系往来单位；对账单号：${number}，对账单名称：${name}", "terminal,ios,android",""),
+            "贵司撤回了与【${company}】的物流对账，请及时确认并联系往来单位；对账单号：${number}，对账单名称：${name}", "terminal,ios,android", ""),
     LEDGER_REVOCATION_SHIPPER("BUSINESS", "BUSINESS_LEDGER_REVOCATION_SHIPPER", "撤回对账",
-            "【${company}】撤回了对贵司发起的物流对账申请，请及时确认；对账单号：${number}，对账单名称：${name}", "terminal,ios,android",""),
+            "【${company}】撤回了对贵司发起的物流对账申请，请及时确认；对账单号：${number}，对账单名称：${name}", "terminal,ios,android", ""),
 
     LEDGER_CONFIRM_CARRIER("BUSINESS", "BUSINESS_LEDGER_CONFIRM_CARRIER", "对账申请审核通过",
-            "贵司对【${company}】发起的物流对账申请已审核通过，请及时确认；对账单号：${number}，对账单名称：${name}", "terminal,ios,android",""),
+            "贵司对【${company}】发起的物流对账申请已审核通过，请及时确认；对账单号：${number}，对账单名称：${name}", "terminal,ios,android", ""),
     LEDGER_CONFIRM_SHIPPER("BUSINESS", "BUSINESS_LEDGER_CONFIRM_SHIPPER", "对账申请审核通过",
-            "【${company}】发起的对账申请，贵司已审核通过，请确认；对账单号：${number}，对账单名称：${name}", "terminal,ios,android",""),
+            "【${company}】发起的对账申请，贵司已审核通过，请确认；对账单号：${number}，对账单名称：${name}", "terminal,ios,android", ""),
 
     LEDGER_SUCCESS_CARRIER("BUSINESS", "BUSINESS_LEDGER_SUCCESS_CARRIER", "销售对账完成",
-            "贵司完成了与【${company}】的对账，系统生成了结算单，请及时确认；对账单号：${number}，对账单名称：${name}", "terminal,ios,android",""),
+            "贵司完成了与【${company}】的对账，系统生成了结算单，请及时确认；对账单号：${number}，对账单名称：${name}", "terminal,ios,android", ""),
     LEDGER_SUCCESS_SHIPPER("BUSINESS", "BUSINESS_LEDGER_SUCCESS_SHIPPER", "销售对账完成",
-            "【${company}】已完成对账流程，系统生成了结算单，请及时确认；对账单号：${number}，对账单名称：${name}", "terminal,ios,android",""),
+            "【${company}】已完成对账流程，系统生成了结算单，请及时确认；对账单号：${number}，对账单名称：${name}", "terminal,ios,android", ""),
 
     LEDGER_BACK_CARRIER("BUSINESS", "BUSINESS_LEDGER_BACK_CARRIER", "付款方驳回对账申请",
-            "贵司的物流对账申请被【${company}】驳回，请及时查看；对账单号：${number}，对账单名称：${name}", "terminal,ios,android",""),
+            "贵司的物流对账申请被【${company}】驳回，请及时查看；对账单号：${number}，对账单名称：${name}", "terminal,ios,android", ""),
     LEDGER_BACK_SHIPPER("BUSINESS", "BUSINESS_LEDGER_BACK_SHIPPER", "付款方驳回对账申请",
-            "贵司驳回了与【${company}】的物流对账，请及时确认；对账单号：${number}，对账单名称：${name}", "terminal,ios,android",""),
+            "贵司驳回了与【${company}】的物流对账，请及时确认；对账单号：${number}，对账单名称：${name}", "terminal,ios,android", ""),
 
     /**
      * 销售、采购结算
      */
     //确认对账
     SETTLEMENT_SELL("BUSINESS", "SETTLEMENT_SELL", "新增销售结算任务",
-            "贵司有一条新增的结算业务，请及时查看；【${company}】；结算单号：${number}", "terminal,ios,android",""),
+            "贵司有一条新增的结算业务，请及时查看；【${company}】；结算单号：${number}", "terminal,ios,android", ""),
     SETTLEMENT_PURCHASE("BUSINESS", "SETTLEMENT_PURCHASE", "新增采购结算任务",
-            "贵司有一条新增的结算业务，请及时查看；【${company}】；结算单号：${number}", "terminal,ios,android",""),
+            "贵司有一条新增的结算业务，请及时查看；【${company}】；结算单号：${number}", "terminal,ios,android", ""),
     //确认收款
     SETTLEMENT_CONFIRM_SELL("BUSINESS", "SETTLEMENT_CONFIRM_SELL", "销售结算确认收款",
-            "贵司对一条结算单进行了确认收款操作，请及时确认；结算单号：${number}", "terminal,ios,android",""),
+            "贵司对一条结算单进行了确认收款操作，请及时确认；结算单号：${number}", "terminal,ios,android", ""),
     SETTLEMENT_CONFIRM_PURCHASE("BUSINESS", "SETTLEMENT_CONFIRM_PURCHASE", "采购结算确认收款",
-            "【${company}】与贵司的一条结算业务已确认收款，请及时确认；结算单号：${number}", "terminal,ios,android",""),
+            "【${company}】与贵司的一条结算业务已确认收款，请及时确认；结算单号：${number}", "terminal,ios,android", ""),
     //发起付款
     SETTLEMENT_START_SELL("BUSINESS", "SETTLEMENT_START_SELL", "销售付款被发起",
-            "【${company}】发起了对贵司的付款操作，请及时联系付款方进行确认；结算单号：${number}", "terminal,ios,android",""),
+            "【${company}】发起了对贵司的付款操作，请及时联系付款方进行确认；结算单号：${number}", "terminal,ios,android", ""),
     SETTLEMENT_START_PURCHASE("BUSINESS", "SETTLEMENT_START_PURCHASE", "发起采购付款",
-            "贵司已发起了对【${company}】的付款操作，请及时确认并联系收款单位；结算单号：${number}", "terminal,ios,android",""),
+            "贵司已发起了对【${company}】的付款操作，请及时确认并联系收款单位；结算单号：${number}", "terminal,ios,android", ""),
 
     /**
      * 承运、托运结算
      */
     //确认对账
     SETTLEMENT_CARRIER("BUSINESS", "SETTLEMENT_CARRIER", "新增承运结算任务",
-            "贵司有一条新增的结算业务，请及时查看；【${company}】；结算单号：${number}", "terminal,ios,android",""),
+            "贵司有一条新增的结算业务，请及时查看；【${company}】；结算单号：${number}", "terminal,ios,android", ""),
     SETTLEMENT_SHIPPER("BUSINESS", "SETTLEMENT_SHIPPER", "新增托运结算任务",
-            "贵司有一条新增的结算业务，请及时查看；【${company}】；结算单号：${number}", "terminal,ios,android",""),
+            "贵司有一条新增的结算业务，请及时查看；【${company}】；结算单号：${number}", "terminal,ios,android", ""),
     //确认收款
     SETTLEMENT_CONFIRM_CARRIER("BUSINESS", "SETTLEMENT_CONFIRM_CARRIER", "承运结算确认收款",
-            "贵司对一条结算单进行了确认收款操作，请及时确认；结算单号：${number}", "terminal,ios,android",""),
+            "贵司对一条结算单进行了确认收款操作，请及时确认；结算单号：${number}", "terminal,ios,android", ""),
     SETTLEMENT_CONFIRM_SHIPPER("BUSINESS", "SETTLEMENT_CONFIRM_SHIPPER", "托运结算确认收款",
-            "【${company}】与贵司的一条结算业务已确认收款，请及时确认；结算单号：${number}", "terminal,ios,android",""),
+            "【${company}】与贵司的一条结算业务已确认收款，请及时确认；结算单号：${number}", "terminal,ios,android", ""),
     //发起付款
     SETTLEMENT_START_CARRIER("BUSINESS", "SETTLEMENT_START_CARRIER", "承运付款被发起",
-            "【${company}】发起了对贵司的付款操作，请及时联系付款方进行确认；结算单号：${number}", "terminal,ios,android",""),
+            "【${company}】发起了对贵司的付款操作，请及时联系付款方进行确认；结算单号：${number}", "terminal,ios,android", ""),
     SETTLEMENT_START_SHIPPER("BUSINESS", "SETTLEMENT_START_SHIPPER", "发起托运付款",
-            "贵司已发起了对【${company}】的付款操作，请及时确认并联系收款单位；结算单号：${number}", "terminal,ios,android",""),
+            "贵司已发起了对【${company}】的付款操作，请及时确认并联系收款单位；结算单号：${number}", "terminal,ios,android", ""),
 
     /**
      * 合同-销售合同、托运合同  补充合同
@@ -304,12 +310,12 @@ public enum MessageEnum {
     /**
      * 完结合同
      */
-    SAELCONTRACT_COMPLETE_CONTRACT("BUSINESS", "SAELCONTRACT_COMPLETE_CONTRACT", "完结合同","贵司已完结了与【${entName}】间的签约合同，请及时通知合作单位；合同编号：${contract_no}，合同名称：${name}", "terminal,ios,android", ""),
+    SAELCONTRACT_COMPLETE_CONTRACT("BUSINESS", "SAELCONTRACT_COMPLETE_CONTRACT", "完结合同", "贵司已完结了与【${entName}】间的签约合同，请及时通知合作单位；合同编号：${contract_no}，合同名称：${name}", "terminal,ios,android", ""),
 
     /**
      * 发起
      */
-    SAELCONTRACT_SEND_CONTRACT("BUSINESS", "SAELCONTRACT_SEND_CONTRACT", "发起合同签约","贵司新建了合同并发起与【${entName}】的合同签约流程，请留意电话短信；合同编号：${contract_no}，合同名称：${name}", "terminal,ios,android", ""),
+    SAELCONTRACT_SEND_CONTRACT("BUSINESS", "SAELCONTRACT_SEND_CONTRACT", "发起合同签约", "贵司新建了合同并发起与【${entName}】的合同签约流程，请留意电话短信；合同编号：${contract_no}，合同名称：${name}", "terminal,ios,android", ""),
 
     /**
      * 合同签约成功
@@ -340,9 +346,6 @@ public enum MessageEnum {
     ;
 
 
-
-
-
     /**
      * 消息分类：BUSINESS业务消息，SYSTEM系统消息
      */
@@ -409,4 +412,22 @@ public enum MessageEnum {
         }
         return null;
     }
+
+    public static List<MessageEnum> getEnums(Boolean isMain, Integer length, Set<MessageEnum> excludeEnums) {
+        List<MessageEnum> list = Arrays.stream(MessageEnum.values())
+                .filter(e -> CollectionUtils.isEmpty(excludeEnums) || !excludeEnums.contains(e))
+                .filter(e -> Boolean.TRUE.equals(isMain) || "BUSINESS".equals(e.getCategory()))
+                .limit(length)
+                .collect(Collectors.toList());
+        return CollectionUtils.emptyIfNull(list);
+    }
+
+    public static MessageEnum getEnumByCategoryAndType(String category, String type) {
+        for (MessageEnum e : MessageEnum.values()) {
+            if (e.getCategory().equals(category) && e.getType().equals(type)) {
+                return e;
+            }
+        }
+        return null;
+    }
 }

sckw-modules/sckw-message/src/main/java/com/sckw/message/model/dto/UserMsgCenterLatestMsgDTO.java

@@ -29,6 +29,8 @@ public class UserMsgCenterLatestMsgDTO implements Serializable {
      */
     private Integer status;
 
+    private String category;
+
     /**
      * 消息分类
      */

sckw-modules/sckw-message/src/main/java/com/sckw/message/service/KwmMessageUserService.java

@@ -163,7 +163,8 @@ public class KwmMessageUserService {
      * @return: java.util.List<com.sckw.message.model.vo.res.UserMsgCenterResVO>
      */
     public List<UserMsgCenterResVO> userMsgCenter(UserMsgCenterReqDTO dto) {
-        return kwmMessageUserMapper.userMsgCenter(dto);
+        List<UserMsgCenterResVO> list = kwmMessageUserMapper.userMsgCenter(dto);
+        return CollectionUtils.emptyIfNull(list);
     }
 
     /**

sckw-modules/sckw-message/src/main/java/com/sckw/message/service/MessageService.java

@@ -25,6 +25,7 @@ import com.sckw.message.model.vo.req.StatisticsMessagesReqVO;
 import com.sckw.message.model.vo.res.KwmMessageListResVO;
 import com.sckw.message.model.vo.res.MessagesStatisticsResVO;
 import com.sckw.message.model.vo.res.UserMsgCenterResVO;
+import com.sckw.stream.enums.MessageEnum;
 import com.sckw.system.api.RemoteSystemService;
 import com.sckw.system.api.model.dto.res.EntCacheResDto;
 import com.sckw.system.api.model.dto.res.UserCacheResDto;
@@ -279,15 +280,13 @@ public class MessageService {
      */
     public List<UserMsgCenterResVO> userMsgCenter() {
         UserMsgCenterReqDTO dto = new UserMsgCenterReqDTO();
-        if (Objects.equals(LoginUserHolder.getIsMain(), 1)) {
-            dto.setEntId(LoginUserHolder.getEntId());
-        } else {
-            dto.setUserId(LoginUserHolder.getUserId());
-        }
+        boolean isMain = Objects.equals(LoginUserHolder.getIsMain(), 1);
+        dto.setEntId(isMain ? LoginUserHolder.getEntId() : null);
+        dto.setUserId(isMain ? null : LoginUserHolder.getUserId());
         List<UserMsgCenterResVO> result = kwmMessageUserService.userMsgCenter(dto);
-        if (CollectionUtils.isEmpty(result)) {
-            return Collections.emptyList();
-        }
+        int size = result.size();
+        boolean flag = size < 5;
+        Set<MessageEnum> excludeEnums = new HashSet<>();
         String clientType = LoginUserHolder.getClientType();
         result.forEach(e -> {
             dto.setStatus(e.getStatus()).setType(e.getType());
@@ -299,7 +298,21 @@ public class MessageService {
             e.setId(msg.getId()).setTitle(msg.getTitle())
                     .setContent(msg.getContent())
                     .setCreateTime(msg.getCreateTime());
+            if (flag) {
+                MessageEnum messageEnum = MessageEnum.getEnumByCategoryAndType(msg.getCategory(), msg.getType());
+                if (Objects.nonNull(messageEnum)) {
+                    excludeEnums.add(messageEnum);
+                }
+            }
         });
+        if (flag) {
+            List<MessageEnum> enums = MessageEnum.getEnums(isMain, 5 - size, excludeEnums);
+            enums.forEach(e -> {
+                UserMsgCenterResVO vo = new UserMsgCenterResVO();
+                vo.setTitle(e.getTitle()).setContent("暂无" + e.getTitle());
+                result.add(vo);
+            });
+        }
         return result;
     }
 }

sckw-modules/sckw-message/src/main/resources/mapper/KwmMessageUserMapper.xml

@@ -58,7 +58,7 @@
     <select id="getLatestMsg" resultType="com.sckw.message.model.dto.UserMsgCenterLatestMsgDTO">
         SELECT
         mu.id, mu.status, mu.create_time as createTime,
-        m.type, m.title, m.content, m.url
+        m.category, m.type, m.title, m.content, m.url
         FROM
         kwm_message_user mu
         LEFT JOIN kwm_message m ON mu.msg_id = m.id