From 9157a7cd26d7a82a065e7afdc9b1ddfc6a62250b Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期一, 18 四月 2022 15:00:55 +0800
Subject: [PATCH] 播放计划列表

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedSFileService.java |   20 +++++++++++---------
 1 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedSFileService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedSFileService.java
index b33654a..a7c9027 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedSFileService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedSFileService.java
@@ -29,12 +29,12 @@
 
     public boolean addProgramFile(MultipartFile file) {
         FileUploadDto fileUploadDto = aliOssFileService.uploadFile(file);
-        if("mp4".equals(fileUploadDto.getFileType())){
-            fileUploadDto.setScreenShot(fileUploadDto.getFileUrl()+"?x-oss-process=video/snapshot,t_10000,m_fast");
+        if ("mp4".equals(fileUploadDto.getFileType())) {
+            fileUploadDto.setScreenShot(fileUploadDto.getFileUrl() + "?x-oss-process=video/snapshot,t_10000,m_fast");
         }
-        FileOperationRecord fileOperationRecord=new FileOperationRecord();
-        if("mp4".equals(fileUploadDto.getFileType())){
-            fileOperationRecord.setScreenShot(fileUploadDto.getFileUrl()+"?x-oss-process=video/snapshot,t_10000,m_fast");
+        FileOperationRecord fileOperationRecord = new FileOperationRecord();
+        if ("mp4".equals(fileUploadDto.getFileType())) {
+            fileOperationRecord.setScreenShot(fileUploadDto.getFileUrl() + "?x-oss-process=video/snapshot,t_10000,m_fast");
         }
         BeanUtils.copyProperties(fileUploadDto, fileOperationRecord);
         fileOperationRecordService.save(fileOperationRecord);
@@ -57,11 +57,13 @@
         return removeById(id);
     }
 
-    public LambdaQueryWrapper<LedSFile> listFile(){
+    public LambdaQueryWrapper<LedSFile> listFile() {
         LambdaQueryWrapper<LedSFile> ledProgramFileLambdaQueryWrapper = Wrappers.lambdaQuery(LedSFile.class);
-        if(SecurityUtils.getClientId()!=null){
-            return ledProgramFileLambdaQueryWrapper.eq(LedSFile::getCilentId,SecurityUtils.getUserId());
-        }else {
+        if (SecurityUtils.getClientId() != null) {
+            return ledProgramFileLambdaQueryWrapper.eq(LedSFile::getCilentId, SecurityUtils.getUserId()).or(w -> {
+                w.eq(LedSFile::getUserId, SecurityUtils.getUserId());
+            });
+        } else {
             return ledProgramFileLambdaQueryWrapper;
         }
 

--
Gitblit v1.9.3