|
@@ -505,6 +505,8 @@ public class CommunityArticleController extends BaseController {
|
|
CommunityArticleCollect collect = communityArticleService.selectCommunityCollectById(communityArticleCollect);
|
|
CommunityArticleCollect collect = communityArticleService.selectCommunityCollectById(communityArticleCollect);
|
|
if (Objects.isNull(collect) || Objects.isNull(collect.getId())) {
|
|
if (Objects.isNull(collect) || Objects.isNull(collect.getId())) {
|
|
//新增收藏
|
|
//新增收藏
|
|
|
|
+ communityArticleCollect.setCreateTime(DateUtils.parseDate(DateUtils.getTime()));
|
|
|
|
+ communityArticleCollect.setCreateBy(String.valueOf(SecurityUtils.getUserId()));
|
|
isSuccess = communityArticleService.insertCommunityCollectById(communityArticleCollect);
|
|
isSuccess = communityArticleService.insertCommunityCollectById(communityArticleCollect);
|
|
message = "收藏成功";
|
|
message = "收藏成功";
|
|
} else {
|
|
} else {
|
|
@@ -674,17 +676,13 @@ public class CommunityArticleController extends BaseController {
|
|
userCircle.setCircleId(communityUserCircle.getCircleId());
|
|
userCircle.setCircleId(communityUserCircle.getCircleId());
|
|
userCircle.setUserId(userId);
|
|
userCircle.setUserId(userId);
|
|
userCircle.setCreateBy(userId);
|
|
userCircle.setCreateBy(userId);
|
|
- userCircle.setUpdateBy(userId);
|
|
|
|
userCircle.setCreateTime(DateUtils.parseDate(DateUtils.getTime()));
|
|
userCircle.setCreateTime(DateUtils.parseDate(DateUtils.getTime()));
|
|
- userCircle.setUpdateTime(DateUtils.parseDate(DateUtils.getTime()));
|
|
|
|
communityUserCircleMapper.insert(userCircle);
|
|
communityUserCircleMapper.insert(userCircle);
|
|
msg = "已关注";
|
|
msg = "已关注";
|
|
} else {
|
|
} else {
|
|
//更新删除标识
|
|
//更新删除标识
|
|
userCircle.setDelete(true);
|
|
userCircle.setDelete(true);
|
|
- userCircle.setCreateBy(userId);
|
|
|
|
userCircle.setUpdateBy(userId);
|
|
userCircle.setUpdateBy(userId);
|
|
- userCircle.setCreateTime(DateUtils.parseDate(DateUtils.getTime()));
|
|
|
|
userCircle.setUpdateTime(DateUtils.parseDate(DateUtils.getTime()));
|
|
userCircle.setUpdateTime(DateUtils.parseDate(DateUtils.getTime()));
|
|
communityUserCircleMapper.updateById(userCircle);
|
|
communityUserCircleMapper.updateById(userCircle);
|
|
msg = "已取关";
|
|
msg = "已取关";
|