重构话题回复相关模块

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/SocialServiceImpl.java

@@ -633,7 +633,7 @@ public class SocialServiceImpl implements SocialServiceI {
         //拿到我自己所有的帖子
         Map<String, Object> parameter = Maps.newHashMap();
         Page<TpTransaction> pageList = PageHelper.startPage(pageNum, paeSize);
-        List<TpTransaction> tpTransactionList = tpTransactionMapper.getUserTransactionList(userElement.getId(), userElement.getCommunityId());
+        List<TpTransaction> tpTransactionList = tpTransactionMapper.getUserTransactionList(userElement.getUserVerifyId(), userElement.getCommunityId());
 
         parameter.put("list", tpTransactionList);
         parameter.put("total", pageList.getTotal());

CODE/smart-community/app-api/src/main/resources/mapper/TpTransactionReplyMapper.xml

@@ -171,17 +171,15 @@
 	tr.community_id = #{communityId}
     and tr.transaction_id=#{transactionId}
       <if test="type == 2" >
-        AND tr.uuid_type = "prop"
+        AND (tr.uuid_type = 'prop' or tr.reply_uuid_type = 'prop')
       </if>
       <if test="type == 1" >
         AND (tr.uuid = #{uuid} OR tr.reply_uuid = #{uuid})
-        AND tr.uuid_type =  #{uuidType}
-        AND tr.reply_uuid_type =  #{uuidType}
+        AND (tr.uuid_type =  #{uuidType} or tr.reply_uuid_type =  #{uuidType})
       </if>
       <if test="type == 0" >
         AND (tr.uuid = #{userID} OR tr.reply_uuid = #{userID})
-        AND tr.uuid_type = 'app'
-        AND tr.reply_uuid_type = 'app'
+        AND (tr.uuid_type = 'app' or tr.reply_uuid_type = 'app')
       </if>
    </select>
    <select id="selectUserTransactionReply" resultMap="BaseResultMap">

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

@@ -332,8 +332,7 @@ public class TransactionServiceImpl extends ServiceImpl<TpTransactionMapper, TpT
 
 		 // 查询帖子信息
 		TpTransaction tpTransaction= tpTransactionMapper.selectById(id);
-		// 查询评论信息
-		TransactionReply  Reply= transactionReplyMapper.selectById(id);
+		
 		TransactionReply transactionReply= new TransactionReply();
 		// 查询回复的ta_userID
 		 User user= userMapper.selectById(userElement.getId());
@@ -351,6 +350,8 @@ public class TransactionServiceImpl extends ServiceImpl<TpTransactionMapper, TpT
 					.setCreateDate(LocalDateTime.now());
 		}
 		if (Type!=1) {
+			// 查询评论信息
+			TransactionReply  Reply= transactionReplyMapper.selectById(id);
 			transactionReply.setCommunityId(userElement.getCommunityId())
 					.setTransactionId(Reply.getTransactionId())
 					.setUuid(userElement.getId())
@@ -359,7 +360,7 @@ public class TransactionServiceImpl extends ServiceImpl<TpTransactionMapper, TpT
 					.setReplyContent(replyContent)
 					.setReplyUuid(Reply.getUuid())
 					.setReplyUuidType("prop")
-					.setReplyUuidName(Reply.getReplyUuidName())
+					.setReplyUuidName(Reply.getUuidName())
 					.setCreateDate(LocalDateTime.now());
 		}
 		transactionReplyMapper.insert(transactionReply);