暂存

CODE/smart-community/app-api/src/main/java/com/community/huiju/model/TpTransaction.java

@@ -28,6 +28,9 @@ public class TpTransaction {
 
     private Date updateDate;
 
+    //返回查询帖子电话
+    private String telephone;
+
     private List<String> imgList;
     
     /**
@@ -163,4 +166,12 @@ public class TpTransaction {
     public void setIsReported(String isReported) {
         this.isReported = isReported;
     }
+
+    public String getTelephone() {
+        return telephone;
+    }
+
+    public void setTelephone(String telephone) {
+        this.telephone = telephone;
+    }
 }

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

@@ -593,7 +593,8 @@ public class SocialServiceImpl implements SocialServiceI {
         }
 
         TpTransaction tpTransaction = tpTransactionMapper.selectByPrimaryKey(activityId,communityId);
-
+        TaUser taUser=taUserMapper.selectByPrimaryKey(tpTransaction.getTaUserId());
+                        tpTransaction.setTelephone(taUser.getLoginName());
         Map<String,Object> map = Maps.newHashMap();
         map.put("uuid",tpTransaction.getId());
         map.put("type",Constant.TRANSACTION);

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

@@ -152,8 +152,6 @@ private  TpAnnouncementMapper tpAnnouncementMapper;
          TpAnnouncement tpAnnouncement = JSONObject.parseObject(paramets, TpAnnouncement.class);
          int Status= Integer.parseInt(tpAnnouncement.getStatus());
          if (0!=Status){
-//                        String announcementimg=tpAnnouncement.getAnnouncementCarouselImg();
-//                        tpAnnouncement.setAnnouncementCarouselImg( "".equals(announcementimg)?null:announcementimg);
                         tpAnnouncement.setCommunityId(communityId);
                         tpAnnouncement.setUpdateUser(userId);
                         tpAnnouncement.setCreateUser(null);