From ab060213fe5b62ba8bf9b87c8a93ba7e9fea05db Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期六, 02 四月 2022 11:39:01 +0800
Subject: [PATCH] 单灯数据导出
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java | 30 ++++++++++++++++++++----------
1 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java
index c9a4119..1ab165d 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java
@@ -641,7 +641,10 @@
if (pole == null) {
throw new BusinessException("鐏潌涓嶅瓨鍦�");
}
- pole.setClientId(clientId);
+ pole.setUserId(clientId);
+ if(!clientService.findClientId(clientId)){
+ pole.setClientId(clientService.getClientId(clientId));
+ }
r = updateById(pole);
if (!r) {
@@ -653,20 +656,27 @@
}
- public List<Pole> getOwnerPole(BaseConditionVO baseConditionVO, String keyword) {
+ public List<Pole> getOwnerPole(BaseConditionVO baseConditionVO, String keyword,Long cilentId) {
LambdaQueryWrapper<Pole> eq;
- if(SecurityUtils.getClientId()!=null){
+// if(SecurityUtils.getClientId()!=null){
PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
- if(clientService.findClientId()){
- eq = Wrappers.lambdaQuery(Pole.class).eq(Pole::getUserId, SecurityUtils.getUserId());
+ if(clientService.findClientId(cilentId)){
+ eq = Wrappers.lambdaQuery(Pole.class).eq(Pole::getUserId, cilentId);
}else{
- eq = Wrappers.lambdaQuery(Pole.class).eq(Pole::getClientId, SecurityUtils.getUserId());
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+ eq = Wrappers.lambdaQuery(Pole.class).eq(Pole::getClientId, cilentId)
+ .or(
+ pole->{
+ pole.eq(Pole::getUserId, cilentId);
+ }
+ );
}
- }else {
- PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
- eq = Wrappers.lambdaQuery(Pole.class);
- }
+// }else {
+// PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+// eq = Wrappers.lambdaQuery(Pole.class);
+// }
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
if (!keyword.isEmpty()){
eq.like(Pole::getPoleName,keyword).or(
code->{
--
Gitblit v1.9.3