Merge remote-tracking branch 'origin/master'

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/DynamicCommentServiceImpl.java

@@ -71,11 +71,11 @@ public class DynamicCommentServiceImpl implements DynamicCommentService {
         lqw.eq(DynamicComment::getParentId, param.getParentId());
         lqw.eq(DynamicComment::getPlatformStatus, 0);
         Long userId = param.getUserId();
-        lqw.and(wq -> wq
+        /*lqw.and(wq -> wq
                 .eq(DynamicComment::getExamineStatus, 1)
                 .or(wq1 -> wq1
                         .eq(DynamicComment::getExamineStatus, 0)
-                        .eq(DynamicComment::getUserId, userId)));
+                        .eq(DynamicComment::getUserId, userId)));*/
         lqw.orderByDesc(DynamicComment::getCreateTime);
         Page<DynamicComment> page = baseMapper.selectPage(
                 new Page<>(pageNum, pageSize), lqw);

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/DynamicContentServiceImpl.java

@@ -187,11 +187,11 @@ public class DynamicContentServiceImpl implements DynamicContentService{
       String keyWord, Long userId) {
     lqw.eq("t1.deleted", 0);
     lqw.eq("t1.platform_status", 0);
-    lqw.and(wq -> wq
+    /*lqw.and(wq -> wq
         .eq("t1.examine_status", 1)
         .or(wq1 -> wq1
             .eq("t1.examine_status", 0)
-            .eq("t1.user_id", userId)));
+            .eq("t1.user_id", userId)));*/
     lqw.and(wq -> wq
         .eq("t1.status", 0)
         .or(wq1 -> wq1