From f8d5a58c5536b72117c342e5a22bd44aa6320c23 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期五, 22 四月 2022 19:10:02 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PlayPlanNvController.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PlayPlanNvController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PlayPlanNvController.java
index c17c2b1..45ad5aa 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PlayPlanNvController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PlayPlanNvController.java
@@ -66,16 +66,17 @@
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
- LambdaQueryWrapper<PlayPlanNv> wrapper = new LambdaQueryWrapper<>();//
- if (AdministratorEnums.CUSTOMER.getCode().equals(SecurityUtils.getAdministratorIdentity())) {
- wrapper = Wrappers.lambdaQuery(PlayPlanNv.class).eq(PlayPlanNv::getUserId, SecurityUtils.getUserId());
+ LambdaQueryWrapper<PlayPlanNv> wrapper = Wrappers.lambdaQuery(PlayPlanNv.class);
+
+ if (SecurityUtils.getClientId() != null) {
+ wrapper = wrapper.eq(PlayPlanNv::getUserId, SecurityUtils.getUserId()).or(w -> {
+ w.eq(PlayPlanNv::getClientId, SecurityUtils.getUserId());
+ });
}
- wrapper = Wrappers.lambdaQuery(PlayPlanNv.class);
- if (StrUtil.isNotBlank(keyword)) {
- wrapper.like(PlayPlanNv::getName, keyword);
+ if (keyword != null && !keyword.isEmpty()) {
+ wrapper = wrapper.like(PlayPlanNv::getName, keyword);
}
List<PlayPlanNv> list = playPlanNvService.list(wrapper);
- //PlayPlanParam param=new PlayPlanParam();
list.forEach(plan -> {
plan.setPlan(JSON.parseObject(plan.getSchedule(), Map.class));
});
--
Gitblit v1.9.3