From 830d1772dfae2ea5eaaf41ecb7cdbcb9efffc6c5 Mon Sep 17 00:00:00 2001
From: nnnjjj123 <494715143@qq.com>
Date: Thu, 28 Jan 2021 16:09:42 +0800
Subject: [PATCH] 设备,警情调整

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/Netty/controller/nettyController.java |    4 ++--
 1 files changed, 2 insertions(+), 2 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..4f39697 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,7 +144,7 @@
 		childMenu = new ArrayList();
 
 		//根据查询条件得到所有设备
-		List<EquipmentVO> pages = equipmentService.selectEquipmentPage(null, null, null, null);
+		List<EquipmentVO> pages = null;
 
 		List<Map<String, Object>> treedatas = catalogService.selectCatalogEqNUmber(pid);
 		//根据传入的id递归出该节点下所有的设备
@@ -201,7 +201,7 @@
 		childMenu = new ArrayList();
 
 		//根据查询条件得到所有设备
-		List<EquipmentVO> pages = equipmentService.selectEquipmentPage(null, null, null, null);
+		List<EquipmentVO> pages = null;
 
 		List<Map<String, Object>> treedatas = catalogService.selectCatalogEqNUmber(pid);
 		//根据传入的id递归出该节点下所有的设备

--
Gitblit v1.9.3