From c00a73b74e67dbeb508865c3da4ed8d57c8631db Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期三, 20 四月 2022 14:16:12 +0800
Subject: [PATCH] fix admin LIST
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedScheduleService.java | 31 ++++++++++++++++++++++---------
1 files changed, 22 insertions(+), 9 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 e090934..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);
}
@@ -136,20 +142,27 @@
}
+ /**
+ * 鎾斁璁″垝鍒楄〃锛堢啓璁級
+ *
+ * @param baseConditionVO
+ * @param keyword
+ * @return
+ */
public List listSchedule(BaseConditionVO baseConditionVO, String keyword) {
- LambdaQueryWrapper<LedScheduleEntity> eq = new LambdaQueryWrapper<>();
- PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
- if (SecurityUtils.getClientId() != null && clientService.findClientId()) {
- eq = Wrappers.lambdaQuery(LedScheduleEntity.class).eq(LedScheduleEntity::getUserId, SecurityUtils.getUserId());
- } else if (SecurityUtils.getClientId() != null && !clientService.findClientId()) {
- eq = Wrappers.lambdaQuery(LedScheduleEntity.class).eq(LedScheduleEntity::getClientId, SecurityUtils.getUserId());
- } else {
- eq = Wrappers.lambdaQuery(LedScheduleEntity.class);
+ LambdaQueryWrapper<LedScheduleEntity> eq = Wrappers.lambdaQuery(LedScheduleEntity.class);
+ //鐢ㄦ埛绫诲瀷鍒ゆ柇
+ if (SecurityUtils.getClientId() != null) {
+ eq = eq.eq(LedScheduleEntity::getUserId, SecurityUtils.getUserId()).or(w -> {
+ w.eq(LedScheduleEntity::getClientId, SecurityUtils.getUserId());
+ });
}
- if (!keyword.isEmpty()) {
+ //妯＄硦鏌ヨ鍏抽敭瀛楀垽鏂�
+ if (keyword != null && !keyword.isEmpty()) {
eq = eq.like(LedScheduleEntity::getName, keyword);
}
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
return list(eq);
}
--
Gitblit v1.9.3