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 { @Param("newFilePath") String newfilePath, @Param("userId") long userId); - IPage selectPageVo(Page page, @Param("userFile") UserFile userFile, @Param("extendNameList") List extendNameList); + IPage 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 impl public IPage getFileByFileType(Integer fileTypeId, Long currentPage, Long pageCount, long userId) { Page page = new Page<>(currentPage, pageCount); - List 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 implements IU authorities.add(simpleGrantedAuthority); } -// List 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 - - extendName in - - #{extendName} - + + + + extendName in (select fileExtendName from fileclassification where fileTypeId = #{fileTypeId}) + + + extendName not in (select fileExtendName from fileclassification where fileTypeId in (1, 2, 3, 4)) + + and a.userId = #{userFile.userId}