修改了动态评论删除和新增

src/main/java/org/rcisoft/app/appArticle/controller/AppOpmArticleController.java

@@ -51,7 +51,7 @@ public class AppOpmArticleController extends CyPaginationController<OpmArticle>
     }
 
 
-    @PreAuthorize("@cyPerm.hasPerm('sys:opmArticle:delete')")
+    @PreAuthorize("@cyPerm.hasPerm('app:opmArticle:delete')")
     @CyOpeLogAnno(title = "system-opmArticle管理管理-删除动态", businessType = CyLogTypeEnum.DELETE)
     @Operation(summary="删除动态", description="删除动态")
     @Parameters({@Parameter(name = "businessId", description = "businessId", required = true)})

src/main/java/org/rcisoft/business/memInfo/entity/MemInfo.java

@@ -612,6 +612,13 @@ public class MemInfo  extends CyIdIncreEntity<MemInfo> {
      /**
       * 学历认证图片url
       */
+     @TableField(exist = false)
      private String memEducationUrl;
+
+     /**
+      * 动态内容
+      */
+     @TableField(exist = false)
+     private String articleContent;
 }
 

src/main/java/org/rcisoft/business/opmArticle/entity/ArticleCommentVO.java

@@ -84,6 +84,12 @@ public class ArticleCommentVO {
      */
     private String isLike;
 
+    /**
+     * 审核状态
+     */
+    private String examStatus;
+
+
     /**
      * 子评论
      */

src/main/java/org/rcisoft/business/opmArticle/entity/OpmArticle.java

@@ -243,5 +243,11 @@ public class OpmArticle extends CyIdIncreEntity<OpmArticle> {
       */
      @TableField(exist = false)
      private String isPay;
+
+     /**
+      * 话题名称
+      */
+     @TableField(exist = false)
+     private Integer topicName;
 }
 

src/main/java/org/rcisoft/business/opmArticle/service/impl/OpmArticleServiceImpl.java

@@ -497,23 +497,31 @@ public class OpmArticleServiceImpl extends ServiceImpl<OpmArticleRepository, Opm
     public CyPersistModel removeComment(ArticleCommentDTO dto,String type){
         if (type.equals("app")){
             //app端
+            ArticleCommentVO comment = baseMapper.selectCommentById(dto.getBusinessId());
             //删除评论
             int line = baseMapper.deleteComment(dto);
             int childrenCommentCount = 0;
+            OpmArticle article = new OpmArticle();
+            article.setBusinessId(dto.getArticleId());
             if (dto.getParentId() != null){
-                //删除的子评论 需要减掉父评论的数量
-                baseMapper.reduceCommentCount(dto.getParentId());
+                if (comment.getExamStatus().equals("1")){
+                    //删除的子评论 需要减掉父评论的数量
+                    baseMapper.reduceCommentCount(dto.getParentId());
+                    article.setCommentCount(1);
+                }
             } else {
-                //删除的是父评论 要查父评论下的子评论数量
-                ArticleCommentVO vo = new ArticleCommentVO();
-                vo.setParentId(dto.getBusinessId());
-                Integer count = baseMapper.selectArticleChildrenCommentCount(vo);
-                childrenCommentCount = count;
+                if (comment.getExamStatus().equals("1")){
+                    //删除的是父评论 要查父评论下的子评论数量
+                    ArticleCommentVO vo = new ArticleCommentVO();
+                    vo.setParentId(dto.getBusinessId());
+                    Integer count = baseMapper.selectArticleChildrenCommentCount(vo);
+                    childrenCommentCount = count;
+                    article.setCommentCount(childrenCommentCount + 1);
+                }
+            }
+            if (comment.getExamStatus().equals("1")){
+              baseMapper.updateArticleCommentCountById(article);
             }
-            OpmArticle article = new OpmArticle();
-            article.setBusinessId(dto.getArticleId());
-            article.setCommentCount(childrenCommentCount + 1);
-            baseMapper.updateArticleCommentCountById(article);
             return new CyPersistModel(1);
         } else {
             //web端

src/main/resources/mapper/business/opmArticle/mapper/OpmArticleMapper.xml

@@ -538,6 +538,7 @@
             mi.mem_career AS memCareer,
             mi.mem_nick_name AS memNickName,
             mi.avatar AS avatarId,
+            opt.topic_name,
 #             oi.url AS memAvatar,
             CASE
                 WHEN oal.business_id IS NOT NULL THEN 1 ELSE 0
@@ -546,6 +547,7 @@
         FROM
             opm_article opa
         LEFT JOIN mem_info mi ON mi.user_id = opa.create_by
+        LEFT JOIN opm_topic opt ON opt.business_id = opa.topic_id
 #         LEFT JOIN (
 #             SELECT
 #                 opm_article.business_id,
@@ -682,6 +684,7 @@
         AND opc.del_flag = '0'
         AND opc.article_id = #{articleId}
         and opc.parent_id = #{parentId}
+        and opc.exam_status = '1'
         AND NOT EXISTS (
             SELECT 1 FROM opm_black_list obl
             WHERE (obl.user_id = #{loginUserId} AND obl.target_id = opc.user_id)