From 9330e9b0e4e70151d36084ecb5695b818cfda2db Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期二, 19 四月 2022 16:07:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedScheduleService.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedScheduleService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedScheduleService.java
index 27b46dc..53db442 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedScheduleService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedScheduleService.java
@@ -83,6 +83,12 @@
String json = JSON.toJSONString(taskSchedules, SerializerFeature.WriteMapNullValue);
// String json = new Gson().toJson(taskSchedules);
ledScheduleEntity.setSchedule(json);
+ if (SecurityUtils.getClientId() != null) {
+ ledScheduleEntity.setUserId(SecurityUtils.getUserId());
+ if (clientService.findClientId()) {
+ ledScheduleEntity.setClientId(clientService.getClientId());
+ }
+ }
return this.save(ledScheduleEntity);
}
@@ -152,7 +158,7 @@
});
}
//妯＄硦鏌ヨ鍏抽敭瀛楀垽鏂�
- if (!keyword.isEmpty()) {
+ if (keyword != null && !keyword.isEmpty()) {
eq = eq.like(LedScheduleEntity::getName, keyword);
}
--
Gitblit v1.9.3