Merge branch '2.0.0' of http://git.ycjcjy.com/fuxingfan/smartCommunity into 2.0.0

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

@@ -900,10 +900,10 @@ public class SocialServiceImpl implements SocialServiceI {
     public ResponseBean findUsedDetailsReply(Integer transactionId, UserElement userElement, String order, Integer pageNum, Integer pageSize, Integer type) {
         ResponseBean responseBean = new ResponseBean();
         //拿到当前帖子的创建人
-        Integer CreateUser = tpTransactionMapper.getById(transactionId).getCreateUser();
+        TpTransaction tpTransaction= tpTransactionMapper.getById(transactionId);
 
         PageHelper.startPage(pageNum, pageSize, "create_date " + order);
-        List<TpTransactionReply> replies = tpTransactionReplyMapper.getCommunityIdAndTransactionId(userElement.getCommunityId(), transactionId, userElement.getUnitId(), CreateUser, type);
+        List<TpTransactionReply> replies = tpTransactionReplyMapper.getCommunityIdAndTransactionId(userElement.getCommunityId(), transactionId, userElement.getUnitId(), tpTransaction.getCreateUser(), type);
         for (TpTransactionReply tpTransactionReply : replies) {
             List<TdImages> tdImagesList = tdImagesMapper.selectImages(tpTransactionReply.getId(), "reply");
             List<String> list = new ArrayList<>();

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

@@ -162,14 +162,17 @@
         tp_transaction_reply tr
     WHERE
 	tr.community_id = #{communityId}
+    and tr.transaction_id=#{transactionId}
       <if test="type != null and type != '' and type == 2" >
-      AND (tr.reply_ta_user_id = (SELECT r.id from tp_user r WHERE tr.ta_user_id = r.id )) OR (ta_user_id = (SELECT r.id from tp_user r WHERE tr.ta_user_id = r.id ))
+        AND release_identity=1
+--       AND (tr.reply_ta_user_id = (SELECT r.id from tp_user r WHERE tr.ta_user_id = r.id )) OR (ta_user_id = (SELECT r.id from tp_user r WHERE tr.ta_user_id = r.id ))
       </if>
       <if test="type != null and type != '' and type == 1" >
-      AND (tr.ta_user_id =#{userID}) OR (tr.reply_ta_user_id = #{userID})
+        AND  tr.ta_user_id = #{founderUserID}
       </if>
       <if test="type != null and type != '' and type == 0" >
-      AND (tr.ta_user_id =#{founderUserID}) OR (tr.reply_ta_user_id = #{founderUserID})
+        AND (tr.ta_user_id = #{founderUserID}) OR (tr.reply_ta_user_id = #{founderUserID})
+--       AND (tr.ta_user_id =#{founderUserID}) OR (tr.reply_ta_user_id = #{founderUserID})
       </if>
    </select>
    <select id="selectUserTransactionReply" resultMap="BaseResultMap">