From 9f21969b69703a35bde9d659be19f3e39795010d Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期四, 12 五月 2022 11:58:01 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java
index 14d1a93..3f35397 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java
@@ -76,12 +76,15 @@
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
CommonPage commonPage = poleService.queryAllStatesAndList(baseConditionVO.getPageNo(), baseConditionVO.getPageSize(), param);
+ List<Pole> listCommonPage = (List<Pole>) commonPage.getList();
+
List<PoleBindVO> listResult = new ArrayList<>();
- for (Pole pole : (List<Pole>) commonPage.getList()) {
+ for (Pole pole : listCommonPage) {
PoleBindVO bindByPoleId = poleService.getBindByPoleId(pole.getId());
bindByPoleId.setPole(pole);
listResult.add(bindByPoleId);
}
+ commonPage.setList(listResult);
return ResponseUtil.success(commonPage);
}
@@ -138,7 +141,6 @@
return ResponseUtil.success(poleService.poleReset(poleId));
}
-//TODO 璁惧鐨勭粦瀹氳В缁戦兘瑕佸崟鐙噸鏂板鐞�
/**
* 鐏潌缁戝畾璁惧
--
Gitblit v1.9.3