From 66080a0b82181aaa567e8080ee2b82315b840930 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期一, 18 四月 2022 14:30:59 +0800
Subject: [PATCH] 节目列表
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LEDProgramService.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 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..e8116b9 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
@@ -19,7 +19,6 @@
public class LEDProgramService extends BaseServiceImpl<LEDProgramMapper, LEDProgram> {
-
public boolean addProgram(LEDProgramParam receiveParam) {
LEDProgram led = new LEDProgram();
@@ -36,7 +35,7 @@
}
- public boolean updateProgram(Long pid,LEDProgramParam receiveParam) {
+ public boolean updateProgram(Long pid, LEDProgramParam receiveParam) {
LEDProgram byId = getById(pid);
if (byId == null) {
@@ -70,7 +69,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 +81,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