合并

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/TransactionServiceImpl.java

@@ -262,7 +262,7 @@ public class TransactionServiceImpl extends ServiceImpl<TpTransactionMapper, TpT
 	public ResponseBean transactionReplyList(String paramets, Integer communityId, Integer userID) {
 		ResponseBean responseBean = new ResponseBean();
 		JSONObject object= JSONObject.parseObject(paramets);
-		Integer id = object.getInteger("id");
+		Integer transactionId = object.getInteger("id");
 		/*回复*/
 		String replyTaUserName = object.getString("replyTaUserName");
 		/*被回复*/
@@ -278,7 +278,7 @@ public class TransactionServiceImpl extends ServiceImpl<TpTransactionMapper, TpT
 		// 获得aap的id
 		Integer taUserId= userMapper.selectById(userID).getTaUserId();
 		// 分页查询
-		List<TransactionReply> TransactionReplylList = transactionReplyMapper.transactionReplyList(page,id,taUserId,status,taUserName,createDate,replyTaUserName);
+		List<TransactionReply> TransactionReplylList = transactionReplyMapper.transactionReplyList(page,transactionId,taUserId,status,taUserName,createDate,replyTaUserName);
 		//查询帖子评论所带图片
 
 		for (TransactionReply transactionReply:TransactionReplylList){

CODE/smart-community/property-api/src/main/resources/mapper/TransactionReplyMapper.xml

@@ -15,23 +15,23 @@
     FROM
         tp_transaction tr
     LEFT JOIN tp_transaction_reply re ON tr.id = re.transaction_id
+    <if test="status == 1 ">
+    LEFT JOIN tp_user u ON re.reply_ta_user_id = u.ta_user_id
+    </if>
     WHERE
         tr.id = #{id}
-    <if test="status != null and status !=''and status == 0 ">
-    AND re.reply_ta_user_id = #{taUserId}
+    <if test="status == 1 ">
+     AND  re.reply_ta_user_id = u.ta_user_id
     </if>
-    <if test="status != null and status !=''and status == 1 ">
-    AND re.release_identity = 0
-    AND re.reply_ta_user_id = #{userID}
+    <if test="status == 0 ">
+    AND re.reply_ta_user_id = #{taUserId,jdbcType=INTEGER}
     </if>
-
-    <if test="status != null and status !=''and status == 2 ">
-    AND re.release_identity = 0
-    AND re.ta_user_id = #{userID}
+    <if test="status == 2 ">
+    AND re.release_identity = 1
     </if>
 
-    <if test="status != null and status !=''and status == 3 ">
-    AND re.ta_user_id = tr.create_user
+    <if test="status == 3 ">
+    AND re.ta_user_id = #{taUserId,jdbcType=INTEGER}
     </if>
 
     <if test="taUserName != null and taUserName !=''">