合并

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

@@ -895,7 +895,16 @@ public class SocialServiceImpl implements SocialServiceI {
         }
 
         TpTransaction tpTransaction = tpTransactionMapper.selectByPrimaryKey(activityId, communityId);
-
+    
+        if (tpTransaction.getUuidType().equals("app")) {
+            TaUser taUser = taUserMapper.selectByPrimaryKey(taUserVerifyMapper.selectByPrimaryKey(tpTransaction.getUuid()).getUserId());
+            tpTransaction.setTelephone(taUser.getLoginName());
+        }
+        if (tpTransaction.getUuidType().equals("prop")) {
+           TpUser tpUser = tpUserMapper.selectByPrimaryKey(tpTransaction.getUuid());
+            tpTransaction.setTelephone(tpUser.getLoginName());
+        }
+        
         Map<String, Object> map = Maps.newHashMap();
         map.put("uuid", tpTransaction.getId());
         map.put("type", Constant.TRANSACTION);