Merge remote-tracking branch 'origin/dev' into dev

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/mapper/mapping/UserCommentMapper.xml

@@ -35,9 +35,9 @@
             IFNULL (CAST(b.AVATAR AS VARCHAR),'') as avatar
         FROM
             user_comment a LEFT JOIN  sys_user b ON a. user_id=b.id
-        WHERE
-            a.resource_id=#{resourceId}  and a.delete_flag='NOT_DELETE'
-          and a.pid IS NOT NULL
+        WHERE a.delete_flag='NOT_DELETE'
+            and a.resource_id=#{resourceId}
+            and a.pid IS NOT NULL
     </select>
 
 
@@ -59,9 +59,10 @@
             IFNULL (CAST(b.AVATAR AS VARCHAR),'') as avatar
         FROM
             user_comment a LEFT JOIN  sys_user b ON a. user_id=b.id
-        WHERE
-            resource_id=#{resourceId}
-          and	pid IS NULL
+        WHERE a.delete_flag='NOT_DELETE'
+          and a.resource_id=#{resourceId}
+          and a.pid IS NULL
+
           order by  giveNum DESC
     </select>