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

         if (null != array) {
             reply = array.toArray(new String[]{});
         }
+        TaUserVerify taUserVerify= taUserVerifyMapper.selectByPrimaryKey(userElement.getUserVerifyId());
         TpTransactionReply tpTransactionReply = JSONObject.parseObject(paramets, TpTransactionReply.class);
         tpTransactionReply.setCommunityId(userElement.getCommunityId());
         tpTransactionReply.setUuid(userElement.getUserVerifyId());
         tpTransactionReply.setUuidType("app");
         tpTransactionReply.setUuidName(userElement.getUserName());
+        tpTransactionReply.setUuidRole(taSysRoleMapper.selectByPrimaryKey(taUserVerify.getRoleId()).getDescription());
 
             // 由于评论帖子和评论对话是同一个接口，当tpTransactionReply.getReplyTaUserId()为空时查询Ta_user里面的名字
         TpTransactionReply tpTransactionReplyBack = tpTransactionReplyMapper.selectByPrimaryKey(tpTransactionReply.getReplyId());
         tpTransactionReply.setReplyUuid(tpTransactionReplyBack.getUuid());
         tpTransactionReply.setReplyUuidType(tpTransactionReplyBack.getUuidType());
         tpTransactionReply.setReplyUuidName(tpTransactionReplyBack.getUuidName());
+        tpTransactionReply.setReplyUuidRole(tpTransactionReplyBack.getReplyUuidRole());
         tpTransactionReply.setReleaseIdentity("0");
-        TaUserVerify taUserVerify= taUserVerifyMapper.selectByPrimaryKey(userElement.getUserVerifyId());
+        
         tpTransactionReply.setCreateDate(new Date());
         tpTransactionReplyMapper.insert(tpTransactionReply);
 

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

 					.setUuid(userElement.getId())
 					.setUuidType("prop")
 					.setUuidName(userElement.getUserName())
+					.setUuidRole("物业")
 					.setReplyContent(replyContent)
 					.setReplyUuid(tpTransaction.getUuid())
 					.setReplyUuidType(tpTransaction.getUuidType())
 					.setUuid(userElement.getId())
 					.setUuidType("prop")
 					.setUuidName(userElement.getUserName())
+					.setUuidRole("物业")
 					.setReplyContent(replyContent)
 					.setReplyUuid(Reply.getUuid())
 					.setReplyUuidType("prop")
 					.setReplyUuidName(Reply.getUuidName())
+					.setUuidRole("物业")
 					.setCreateDate(LocalDateTime.now());
 		}
 		transactionReplyMapper.insert(transactionReply);