From 77a8acaef3a0863adf645f13d87c52f2e41e26aa Mon Sep 17 00:00:00 2001
From: MAC <1162714483@qq.com>
Date: Mon, 27 Dec 2021 22:24:28 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E5=88=86=E7=B1=BB):=20=E5=85=B6=E4=BB=96?=
 =?UTF-8?q?=E7=B1=BB=E5=88=AB=E6=96=87=E4=BB=B6=E6=9F=A5=E7=9C=8B=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../file/controller/OfficeController.java          |  1 -
 .../qiwenshare/file/domain/OperationLogBean.java   |  2 ++
 .../com/qiwenshare/file/mapper/UserFileMapper.java |  2 +-
 .../qiwenshare/file/service/UserFileService.java   |  6 +-----
 .../com/qiwenshare/file/service/UserService.java   |  1 -
 src/main/resources/mapper/UserFileMapper.xml       | 14 +++++++++-----
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/qiwenshare/file/controller/OfficeController.java b/src/main/java/com/qiwenshare/file/controller/OfficeController.java
index 961442c..b0cb21d 100644
--- a/src/main/java/com/qiwenshare/file/controller/OfficeController.java
+++ b/src/main/java/com/qiwenshare/file/controller/OfficeController.java
@@ -13,7 +13,6 @@ import com.qiwenshare.file.api.IUserService;
 import com.qiwenshare.file.config.security.user.JwtUser;
 import com.qiwenshare.file.domain.FileBean;
 import com.qiwenshare.file.domain.FileModel;
-import com.qiwenshare.file.domain.UserBean;
 import com.qiwenshare.file.domain.UserFile;
 import com.qiwenshare.file.dto.file.CreateOfficeFileDTO;
 import com.qiwenshare.file.dto.file.EditOfficeFileDTO;
diff --git a/src/main/java/com/qiwenshare/file/domain/OperationLogBean.java b/src/main/java/com/qiwenshare/file/domain/OperationLogBean.java
index 95f7b36..a947f7c 100644
--- a/src/main/java/com/qiwenshare/file/domain/OperationLogBean.java
+++ b/src/main/java/com/qiwenshare/file/domain/OperationLogBean.java
@@ -70,6 +70,8 @@ public class OperationLogBean {
      */
     private String logLevel;
 
+
     private Integer platform;
 
+
 }
diff --git a/src/main/java/com/qiwenshare/file/mapper/UserFileMapper.java b/src/main/java/com/qiwenshare/file/mapper/UserFileMapper.java
index 22a0b4d..6e26e0c 100644
--- a/src/main/java/com/qiwenshare/file/mapper/UserFileMapper.java
+++ b/src/main/java/com/qiwenshare/file/mapper/UserFileMapper.java
@@ -28,6 +28,6 @@ public interface UserFileMapper extends BaseMapper<UserFile> {
                                @Param("newFilePath") String newfilePath,
                                @Param("userId") long userId);
 
-    IPage<FileListVo> selectPageVo(Page<?> page, @Param("userFile") UserFile userFile, @Param("extendNameList") List<String> extendNameList);
+    IPage<FileListVo> selectPageVo(Page<?> page, @Param("userFile") UserFile userFile, @Param("fileTypeId") Integer fileTypeId);
     Long selectStorageSizeByUserId(@Param("userId") Long userId);
 }
diff --git a/src/main/java/com/qiwenshare/file/service/UserFileService.java b/src/main/java/com/qiwenshare/file/service/UserFileService.java
index bc61e44..d18efbb 100644
--- a/src/main/java/com/qiwenshare/file/service/UserFileService.java
+++ b/src/main/java/com/qiwenshare/file/service/UserFileService.java
@@ -154,13 +154,9 @@ public class UserFileService  extends ServiceImpl<UserFileMapper, UserFile> impl
     public IPage<FileListVo> getFileByFileType(Integer fileTypeId, Long currentPage, Long pageCount, long userId) {
         Page<FileListVo> page = new Page<>(currentPage, pageCount);
 
-        List<String> extendNameList = fileTypeMapper.selectExtendNameByFileType(fileTypeId);
-        if (extendNameList != null && extendNameList.isEmpty()) {
-            return page;
-        }
         UserFile userFile = new UserFile();
         userFile.setUserId(userId);
-        return userFileMapper.selectPageVo(page, userFile, extendNameList);
+        return userFileMapper.selectPageVo(page, userFile, fileTypeId);
     }
 
     @Override
diff --git a/src/main/java/com/qiwenshare/file/service/UserService.java b/src/main/java/com/qiwenshare/file/service/UserService.java
index aba90c5..6352835 100644
--- a/src/main/java/com/qiwenshare/file/service/UserService.java
+++ b/src/main/java/com/qiwenshare/file/service/UserService.java
@@ -152,7 +152,6 @@ public class UserService extends ServiceImpl<UserMapper, UserBean> implements IU
             authorities.add(simpleGrantedAuthority);
         }
 
-//        List<SimpleGrantedAuthority> authorities = roleList.stream().map(Role::getRoleName).map(SimpleGrantedAuthority::new).collect(Collectors.toList());
         JwtUser jwtUser = new JwtUser(user.getUserId(), user.getUsername(), user.getPassword(),
                 user.getAvailable(), authorities);
         return jwtUser;
diff --git a/src/main/resources/mapper/UserFileMapper.xml b/src/main/resources/mapper/UserFileMapper.xml
index 7055460..ee343ba 100644
--- a/src/main/resources/mapper/UserFileMapper.xml
+++ b/src/main/resources/mapper/UserFileMapper.xml
@@ -17,11 +17,15 @@
         left join image on a.fileId = image.fileId
         left join file on file.fileId = a.fileId
         <where>
-            <if test="extendNameList != null and extendNameList.size() > 0">
-                extendName in
-                <foreach collection="extendNameList" open="(" close=")" separator="," item="extendName" >
-                    #{extendName}
-                </foreach>
+            <if test="fileTypeId != null">
+                <choose>
+                    <when test="fileTypeId != 5">
+                        extendName in (select fileExtendName from fileclassification where fileTypeId = #{fileTypeId})
+                    </when>
+                    <otherwise>
+                        extendName not in (select fileExtendName from fileclassification where fileTypeId in (1, 2, 3, 4))
+                    </otherwise>
+                </choose>
             </if>
             <if test="userFile.userId != null">
                 and a.userId = #{userFile.userId}