上传代码改查代码提交

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

@@ -27,7 +27,7 @@
             a.name commentName,
             a.user_id userId,
             a.time,
-            a.give_num giveNum,
+            ifnull(a.give_num,0) giveNum,
             (SELECT count(1) FROM  question_answer_give WHERE question_answerid=a.id AND user_id=#{userId} and  delete_flag='NOT_DELETE') giveNumSelf,
             b.name  userName
         FROM

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

@@ -19,7 +19,7 @@
               CREATE_USER_ID createUserId,
               DELETE_BATCH_NUM deleteBatchNum,
               DELETE_TIME deleteFlag,
-              EXTEND_NAME deleteTime,
+              EXTEND_NAME extendName,
               FILE_ID fileId,
               FILE_NAME fileName,
               FILE_PATH filePath,

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/util/MinioUtil.java

@@ -126,7 +126,8 @@ public class MinioUtil {
                    }else{
                        ResourceUserFile newUserFile=new  ResourceUserFile();
                        BeanUtil.copyProperties(userFile, newUserFile);
-                       newUserFile.setFileName(item.getFileName()+"("+userFileCount+")");
+                       String fileName=item.getFileName().substring(0,item.getFileName().lastIndexOf("."));
+                       newUserFile.setFileName(fileName+"("+userFileCount+")"+item.getFileSuffix());
                        newUserFile.setMd5(item.getMd5());
                        resourceUserFileMapper.insert(newUserFile);
                        noExitList.add(newUserFile);
@@ -144,6 +145,7 @@ public class MinioUtil {
         return noExitList;
     }
 
+
     /**
      * 上传文件分块
      *