From 49a12928b30f758d15074ead307390ecdbdd43da Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Mon, 01 Feb 2021 09:55:29 +0800
Subject: [PATCH] 初版

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/Netty/controller/nettyController.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/Netty/controller/nettyController.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/Netty/controller/nettyController.java
index 9b30c94..e5cdca5 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/Netty/controller/nettyController.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/Netty/controller/nettyController.java
@@ -144,9 +144,9 @@
 		childMenu = new ArrayList();
 
 		//根据查询条件得到所有设备
-		List<EquipmentVO> pages = equipmentService.selectEquipmentPage(null, null, null, null);
+		List<EquipmentVO> pages = null;
 
-		List<Map<String, Object>> treedatas = catalogService.selectCatalogEqNUmber(pid);
+		List<Map<String, Object>> treedatas = catalogService.selectCatalogEqNUmber();
 		//根据传入的id递归出该节点下所有的设备
 		List<Map<String, Object>> childList = treeMenuList(treedatas, Integer.parseInt(pid));
 
@@ -201,9 +201,9 @@
 		childMenu = new ArrayList();
 
 		//根据查询条件得到所有设备
-		List<EquipmentVO> pages = equipmentService.selectEquipmentPage(null, null, null, null);
+		List<EquipmentVO> pages = null;
 
-		List<Map<String, Object>> treedatas = catalogService.selectCatalogEqNUmber(pid);
+		List<Map<String, Object>> treedatas = catalogService.selectCatalogEqNUmber();
 		//根据传入的id递归出该节点下所有的设备
 		List<Map<String, Object>> childList = treeMenuList(treedatas, Integer.parseInt(pid));
 

--
Gitblit v1.9.3