From a33990498e32fda774dacf849bfcd660c58da8e7 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 28 四月 2022 15:22:17 +0800
Subject: [PATCH] Merge branch 'huacheng' into huacheng_paicha
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDynServiceImpl.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDynServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDynServiceImpl.java
index 571f957..30e7974 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDynServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDynServiceImpl.java
@@ -26,6 +26,8 @@
import lombok.extern.slf4j.Slf4j;
+import static java.util.Objects.nonNull;
+
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
* @description: 社区动态
@@ -89,13 +91,16 @@
if (ObjectUtils.isEmpty(comActDynDO)) {
return R.fail("社区动态不存在");
}
- ComActDO comActDO = comActDAO.selectById(comActDynDO.getCommunityId());
+ Integer category = comActDynDO.getCategory();
Integer count = comActDynUserDAO
.selectCount(new QueryWrapper<ComActDynUserDO>().lambda().eq(ComActDynUserDO::getDynId, id));
ComActDynVO comActDynVO = new ComActDynVO();
BeanUtils.copyProperties(comActDynDO, comActDynVO);
comActDynVO.setReadNum(count);
- comActDynVO.setCommunityName(comActDO.getName());
+ if (nonNull(category) && !category.equals(3)) {
+ ComActDO comActDO = comActDAO.selectById(comActDynDO.getCommunityId());
+ comActDynVO.setCommunityName(comActDO.getName());
+ }
return R.ok(comActDynVO);
}
--
Gitblit v1.7.1