From 20982602de2ada9506e2b037e354f9a091a3d51e Mon Sep 17 00:00:00 2001
From: zhizhi wu <2377881365@qq.com>
Date: Tue, 2 Jun 2020 16:12:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E9=A1=B9=E7=9B=AEID/?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=9F=A5=E8=AF=A2=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper_dao/SysOperationDao.xml | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/tall/src/main/resources/mapper_dao/SysOperationDao.xml b/tall/src/main/resources/mapper_dao/SysOperationDao.xml
index e154dcdd..e46180fa 100644
--- a/tall/src/main/resources/mapper_dao/SysOperationDao.xml
+++ b/tall/src/main/resources/mapper_dao/SysOperationDao.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ccsens.tall.persist.dao.SysOperationDao">
+<mapper namespace="com.ccsens.tall.persist.dao.SysOperationDao" xmlns:c="http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
     <resultMap id="MessageQuery" type="com.ccsens.tall.bean.vo.ProjectMessageVo$Query">
         <result column="id" jdbcType="BIGINT" property="id"></result>
@@ -37,11 +37,14 @@
             t_sys_message_send s, t_sys_operation o
         WHERE
             s.operation_id = o.id
-            AND s.receiver_id = #{userId}
-            <if test="param.projectId != null">
-                AND o.project_id = #{param.projectId}
-            </if>
-
+            <choose>
+                <when test="param.projectId != null">
+                    AND o.project_id = #{param.projectId}
+                </when>
+                <otherwise>
+                    AND s.receiver_id = #{userId}
+                </otherwise>
+            </choose>
             AND s.send_type = #{param.sendType}
             AND s.rec_status = 0
             AND o.rec_status = 0