From 31cf1ba9219b705ea59dc8a98b6a7b11bd6db002 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 30 Mar 2021 09:56:15 +0800
Subject: [PATCH] 设备查询允许在线查询
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/impl/EquipmentServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/impl/EquipmentServiceImpl.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/impl/EquipmentServiceImpl.java
index 8aff20b..cad368b 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/impl/EquipmentServiceImpl.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/impl/EquipmentServiceImpl.java
@@ -63,15 +63,15 @@
@Override
- public IPage<EquipmentVO> selectDeptPages(IPage<EquipmentVO> page, EquipmentVO equipment,String pid) {
+ public IPage<EquipmentVO> selectDeptPages(IPage<EquipmentVO> page, EquipmentVO equipment,String pid,String dxdype) {
List deptIdList;
- if (!pid.equals("")){
+ if (pid != null && !pid.equals("")){
deptIdList = SysCache.getDeptChildIds(Long.valueOf(pid));
}else{
deptIdList = SysCache.getDeptChildIds(null);
}
- return page.setRecords(baseMapper.selectDeptPages(page,equipment,deptIdList));
+ return page.setRecords(baseMapper.selectDeptPages(page,equipment,deptIdList,dxdype));
}
--
Gitblit v1.9.3