Merge branch 'dev' of http://192.168.1.245:11111/jinjilong/onlineEducation-fwd into dev

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/domain/UserCommentGive.java

@@ -31,7 +31,7 @@ import java.util.Date;
 public class UserCommentGive {
 
     /** ID */
-    @TableId
+    @TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "ID", position = 1)
     private Long id;
 

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

@@ -9,7 +9,7 @@
             a.user_id userId,
             a.comment_time,
             ifnull(a.give_num,0) giveNum,
-            (SELECT count(1) FROM  user_comment_give WHERE comment_id=4 AND user_id=#{userId}) giveNumSelf,
+            (SELECT count(1) FROM  user_comment_give WHERE comment_id=a.id AND user_id=#{userId} and  delete_flag='NOT_DELETE') giveNumSelf,
             b.name  userName
         FROM
             user_comment a LEFT JOIN  sys_user b ON a. user_id=b.id
@@ -27,7 +27,7 @@
             a.user_id userId,
             a.comment_time,
             a.give_num giveNum,
-            (SELECT count(1) FROM  user_comment_give WHERE comment_id=4 AND user_id=#{userId}) giveNumSelf,
+            (SELECT count(1) FROM  user_comment_give WHERE comment_id=a.id AND user_id=#{userId} and  delete_flag='NOT_DELETE') giveNumSelf,
             b.name  userName
         FROM
             user_comment a LEFT JOIN  sys_user b ON a. user_id=b.id