合并

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

@@ -206,8 +206,11 @@ public class SocialServiceImpl implements SocialServiceI {
             activity.setViewCount(allViewNum);
             tpActivityMapper.updateByPrimaryKeySelective(activity);
         }
-
-        TpActivity tpActivity = tpActivityMapper.selectByPrimaryKey(activityId, communityId);
+        TpActivity  tpActivity=new TpActivity();
+         tpActivity = tpActivityMapper.selectByPrimaryKey(activityId, communityId);
+        if(null == tpActivity){
+            tpActivity = tpActivityMapper.selectActivity(activityId);
+        }
         TpUser tpUser = tpUserMapper.selectByPrimaryKey(tpActivity.getCreateUser());
         if (null != tpUser) {
             tpActivity.setUserName(tpUser.getUserName());
@@ -620,7 +623,7 @@ public class SocialServiceImpl implements SocialServiceI {
         ResponseBean responseBean = new ResponseBean();
         Map<String, Object> parameter = Maps.newHashMap();
         Page<TpActivity> pageList = PageHelper.startPage(pageNum, paeSize);
-        List<TpActivity> tpActivity = tpActivityMapper.selecttpActivity(userElement.getId(), userElement.getCommunityId());
+        List<TpActivity> tpActivity = tpActivityMapper.selecttpActivity(userElement.getUserVerifyId(), userElement.getCommunityId());
         parameter.put("list", tpActivity);
         parameter.put("total", pageList.getTotal());
         responseBean.addSuccess(parameter);