From 39ada1702979b83b0573faf784a7c0bd46335260 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期二, 10 五月 2022 18:17:47 +0800
Subject: [PATCH] 一键求助
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LEDProgramService.java | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LEDProgramService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LEDProgramService.java
index a03e5d8..ac3a1ea 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LEDProgramService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LEDProgramService.java
@@ -18,14 +18,17 @@
@AllArgsConstructor
public class LEDProgramService extends BaseServiceImpl<LEDProgramMapper, LEDProgram> {
-
+ private final ClientService clientService;
public boolean addProgram(LEDProgramParam receiveParam) {
LEDProgram led = new LEDProgram();
- led.setUserId(SecurityUtils.getClientId());
if (SecurityUtils.getClientId() != null) {
+ led.setUserId(SecurityUtils.getUserId());
led.setUserName(SecurityUtils.getUsername());
+ if (clientService.findClientId()) {
+ led.setClientId(clientService.getClientId());
+ }
}
led.setName(receiveParam.getName());
led.setPreview(receiveParam.getPreviewUrl());
@@ -36,7 +39,7 @@
}
- public boolean updateProgram(Long pid,LEDProgramParam receiveParam) {
+ public boolean updateProgram(Long pid, LEDProgramParam receiveParam) {
LEDProgram byId = getById(pid);
if (byId == null) {
@@ -70,7 +73,7 @@
if (byId == null) {
throw new BusinessException("鏈壘鍒拌鑺傜洰");
}
- LEDProgramParam param=new LEDProgramParam();
+ LEDProgramParam param = new LEDProgramParam();
param.setId(byId.getId());
param.setHeight(byId.getHeight());
param.setWidth(byId.getWidth());
@@ -82,11 +85,13 @@
public LambdaQueryWrapper<LEDProgram> listProgram() {
- if (SecurityUtils.getClientId() != null) {
- return Wrappers.lambdaQuery(LEDProgram.class).eq(LEDProgram::getUserId, SecurityUtils.getClientId());
- } else {
+ if (SecurityUtils.getClientId() == null) {
return Wrappers.lambdaQuery(LEDProgram.class);
+ } else {
+ return Wrappers.lambdaQuery(LEDProgram.class).eq(LEDProgram::getUserId, SecurityUtils.getUserId())
+ .or(w -> {
+ w.eq(LEDProgram::getClientId, SecurityUtils.getClientId());
+ });
}
}
-
}
--
Gitblit v1.9.3