Merge branch 'develop'

kustomization/overlays/dev/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/ims
-  newTag: fbbe8e2ca2c2b7564b2f2e5521885f82ce39ed40
+  newTag: 70b7a804fba2c57ee482a4e521d68b8ecfa6483a

release-service/src/main/java/com/mmc/csf/release/service/impl/DynamicServiceImpl.java

@@ -285,8 +285,10 @@ public class DynamicServiceImpl implements DynamicService {
 
     @Override
     public ResultBody dynamicDetails(Integer dynamicId, Integer userId, HttpServletRequest request) {
-        // 判断此动态是否还存在
 
+        boolean isAdmin = userId == 1;
+
+        // 判断此动态是否还存在
         ForumDynamicDO dynamicInfo = dynamicDao.getDynamicInfoById(dynamicId);
         if (dynamicInfo == null) {
             return ResultBody.error("动态不存在！");
@@ -329,8 +331,10 @@ public class DynamicServiceImpl implements DynamicService {
             dynamicVO.setMediaVO(MediaVOList);
         }
         // 动态评论列表
-        List<DynamicVO> listDynamic = getCommentInfo(dynamicId, request);
-        dynamicVO.setCommentAndReplyVO(listDynamic);
+        if(!isAdmin) {
+            List<DynamicVO> listDynamic = getCommentInfo(dynamicId, request);
+            dynamicVO.setCommentAndReplyVO(listDynamic);
+        }
 
         return ResultBody.success(dynamicVO);
     }