From d170546ea4498d282c9cfef6258e4498aed7835e Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期五, 22 四月 2022 15:57:22 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LEDProgramFileService.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 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 37e172e..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
@@ -17,13 +17,17 @@
public class LEDProgramFileService extends BaseServiceImpl<LEDProgramFileMapper, LEDProgramFile> {
private final LEDProgramFileMapper ledProgramFileMapper;
+ private final ClientService clientService;
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());
+ }
}
return save(file);
}
@@ -36,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