From 782ed1b19cb375c716cf1e3aaf86d4f769994727 Mon Sep 17 00:00:00 2001
From: toesbieya <1647775459@qq.com>
Date: Sat, 25 Jul 2020 18:47:23 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E6=97=A0=E7=94=A8=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/toesbieya/jxc/message/mapper/MsgMapper.java     |  2 --
 .../toesbieya/jxc/message/service/MsgUserService.java  | 10 +---------
 .../message/src/main/resources/mapper/Msg.xml          |  7 -------
 .../main/java/com/toesbieya/my/mapper/MsgMapper.java   |  2 --
 .../main/java/com/toesbieya/my/service/MsgService.java |  6 +-----
 java/local/src/main/resources/mapper/Msg.xml           |  7 -------
 6 files changed, 2 insertions(+), 32 deletions(-)

diff --git a/java/cloud/web/web-modules/message/src/main/java/cn/toesbieya/jxc/message/mapper/MsgMapper.java b/java/cloud/web/web-modules/message/src/main/java/cn/toesbieya/jxc/message/mapper/MsgMapper.java
index bd35f4f..428a28c 100644
--- a/java/cloud/web/web-modules/message/src/main/java/cn/toesbieya/jxc/message/mapper/MsgMapper.java
+++ b/java/cloud/web/web-modules/message/src/main/java/cn/toesbieya/jxc/message/mapper/MsgMapper.java
@@ -10,6 +10,4 @@ public interface MsgMapper extends BaseMapper<Msg> {
     List<Msg> getReadByUser(MsgPersonalSearch search);
 
     List<Msg> getUnreadByUser(MsgPersonalSearch search);
-
-    Integer getUnreadCountByUser(MsgPersonalSearch search);
 }
diff --git a/java/cloud/web/web-modules/message/src/main/java/cn/toesbieya/jxc/message/service/MsgUserService.java b/java/cloud/web/web-modules/message/src/main/java/cn/toesbieya/jxc/message/service/MsgUserService.java
index 3d76fb8..1e7b2ec 100644
--- a/java/cloud/web/web-modules/message/src/main/java/cn/toesbieya/jxc/message/service/MsgUserService.java
+++ b/java/cloud/web/web-modules/message/src/main/java/cn/toesbieya/jxc/message/service/MsgUserService.java
@@ -25,16 +25,8 @@ public class MsgUserService {
 
     public PageResult<Msg> search(MsgPersonalSearch vo) {
         PageHelper.startPage(vo.getPage(), vo.getPageSize());
-
         List<Msg> list = vo.isUnread() ? msgMapper.getUnreadByUser(vo) : msgMapper.getReadByUser(vo);
-
-        PageResult<Msg> result = new PageResult<>(list);
-
-        if (vo.isUnread()) {
-            result.setData(msgMapper.getUnreadCountByUser(vo));
-        }
-
-        return result;
+        return new PageResult<>(list);
     }
 
     public Result read(SysUser user, int id) {
diff --git a/java/cloud/web/web-modules/message/src/main/resources/mapper/Msg.xml b/java/cloud/web/web-modules/message/src/main/resources/mapper/Msg.xml
index 78d94f4..5708862 100644
--- a/java/cloud/web/web-modules/message/src/main/resources/mapper/Msg.xml
+++ b/java/cloud/web/web-modules/message/src/main/resources/mapper/Msg.xml
@@ -34,11 +34,4 @@
         <include refid="unreadCondition"/>
         order by id desc
     </select>
-
-    <select id="getUnreadCountByUser" parameterType="cn.toesbieya.jxc.message.model.vo.MsgPersonalSearch"
-            resultType="java.lang.Integer">
-        select count(1)
-        from msg
-        <include refid="unreadCondition"/>
-    </select>
 </mapper>
\ No newline at end of file
diff --git a/java/local/src/main/java/com/toesbieya/my/mapper/MsgMapper.java b/java/local/src/main/java/com/toesbieya/my/mapper/MsgMapper.java
index f7179dc..ac253a1 100644
--- a/java/local/src/main/java/com/toesbieya/my/mapper/MsgMapper.java
+++ b/java/local/src/main/java/com/toesbieya/my/mapper/MsgMapper.java
@@ -26,6 +26,4 @@ public interface MsgMapper {
     List<Msg> getReadByUser(MsgPersonalSearch search);
 
     List<Msg> getUnreadByUser(MsgPersonalSearch search);
-
-    Integer getUnreadCountByUser(MsgPersonalSearch search);
 }
diff --git a/java/local/src/main/java/com/toesbieya/my/service/MsgService.java b/java/local/src/main/java/com/toesbieya/my/service/MsgService.java
index 7f82303..bc3c656 100644
--- a/java/local/src/main/java/com/toesbieya/my/service/MsgService.java
+++ b/java/local/src/main/java/com/toesbieya/my/service/MsgService.java
@@ -95,11 +95,7 @@ public class MsgService {
     public PageResult<Msg> searchPersonal(MsgPersonalSearch vo) {
         PageHelper.startPage(vo.getPage(), vo.getPageSize());
         List<Msg> list = vo.isUnread() ? msgMapper.getUnreadByUser(vo) : msgMapper.getReadByUser(vo);
-        PageResult<Msg> result = new PageResult<>(list);
-        if (vo.isUnread()) {
-            result.setData(msgMapper.getUnreadCountByUser(vo));
-        }
-        return result;
+        return new PageResult<>(list);
     }
 
     public Result read(UserVo user, int id) {
diff --git a/java/local/src/main/resources/mapper/Msg.xml b/java/local/src/main/resources/mapper/Msg.xml
index 01a14c2..3c57b6d 100644
--- a/java/local/src/main/resources/mapper/Msg.xml
+++ b/java/local/src/main/resources/mapper/Msg.xml
@@ -110,11 +110,4 @@
         <include refid="unreadCondition"/>
         order by id desc
     </select>
-
-    <select id="getUnreadCountByUser" parameterType="com.toesbieya.my.model.vo.search.MsgPersonalSearch"
-            resultType="java.lang.Integer">
-        select count(1)
-        from msg
-        <include refid="unreadCondition"/>
-    </select>
 </mapper>
\ No newline at end of file