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

@@ -658,7 +658,17 @@ public class SocialServiceImpl implements SocialServiceI {
         Map<String, Object> parameter = Maps.newHashMap();
         Page<TpTransaction> pageList = PageHelper.startPage(pageNum, paeSize);
         List<TpTransaction> tpTransactionList = tpTransactionMapper.getUserTransactionList(userElement.getUserVerifyId(), userElement.getCommunityId());
-
+        tpTransactionList.stream().forEach(e -> {
+            if (e.getUuidType().equals("app")) {
+                TaSysRole taSysRole = taSysRoleMapper.selectByPrimaryKey(taUserVerifyMapper.selectByPrimaryKey(e.getUuid()).getRoleId());
+                e.setRoleId(taSysRole.getId());
+                e.setRoleName(taSysRole.getRoleName());
+            }
+            if (e.getUuidType().equals("prop")) {
+                e.setRoleName("物业");
+            }
+            e.setCreateUserName(e.getUuidName());
+        });
         parameter.put("list", tpTransactionList);
         parameter.put("total", pageList.getTotal());
         responseBean.addSuccess(parameter);