From b67bd85fbe51486dcacf5a5e3b308e4a0f3e2e43 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期日, 24 四月 2022 18:35:42 +0800
Subject: [PATCH] bug修复
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LEDProgramFileService.java | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LEDProgramFileService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LEDProgramFileService.java
index f8da784..0dc076b 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LEDProgramFileService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LEDProgramFileService.java
@@ -22,13 +22,13 @@
public boolean addProgramFile(LEDProgramFileParam param) {
LEDProgramFile file = new LEDProgramFile();
BeanUtils.copyProperties(param, file);
- file.setUserId(SecurityUtils.getClientId());
if (SecurityUtils.getClientId() != null) {
+ file.setUserId(SecurityUtils.getUserId());
file.setUserName(SecurityUtils.getUsername());
+ if (clientService.findClientId()) {
+ file.setClientId(clientService.getClientId());
+ }
}
-// if("mp4".equals(fileUploadDto.getFileType())){
-// fileUploadDto.setScreenShot(fileUploadDto.getFileUrl()+"?x-oss-process=video/snapshot,t_10000,m_fast");
-// }
return save(file);
}
@@ -40,11 +40,13 @@
return removeById(id);
}
- public LambdaQueryWrapper<LEDProgramFile> listFile(){
+ public LambdaQueryWrapper<LEDProgramFile> listFile() {
LambdaQueryWrapper<LEDProgramFile> ledProgramFileLambdaQueryWrapper = Wrappers.lambdaQuery(LEDProgramFile.class);
- if(SecurityUtils.getClientId()!=null){
- return ledProgramFileLambdaQueryWrapper.eq(LEDProgramFile::getUserId,SecurityUtils.getUserId());
- }else {
+ if (SecurityUtils.getClientId() != null) {
+ return ledProgramFileLambdaQueryWrapper.eq(LEDProgramFile::getUserId, SecurityUtils.getUserId()).or(w -> {
+ w.eq(LEDProgramFile::getClientId, SecurityUtils.getUserId());
+ });
+ } else {
return ledProgramFileLambdaQueryWrapper;
}
--
Gitblit v1.9.3