设备查询允许在线查询

zengh

2021-03-30 31cf1ba9219b705ea59dc8a98b6a7b11bd6db002

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/impl/EquipmentServiceImpl.java

@@ -27,6 +27,7 @@
import org.springblade.jfpt.equipment.service.IEquipmentService;
import org.springblade.jfpt.equipment.vo.EquipmentVO;
import org.springblade.jfpt.equipment.vo.EquipmentVOS;
import org.springblade.system.cache.SysCache;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;

@@ -60,6 +61,21 @@
      return page.setRecords(baseMapper.selectEquipmentPage(page,equipment,null));
   }


   @Override
   public IPage<EquipmentVO> selectDeptPages(IPage<EquipmentVO> page, EquipmentVO equipment,String pid,String dxdype) {

      List deptIdList;
      if (pid != null && !pid.equals("")){
         deptIdList = SysCache.getDeptChildIds(Long.valueOf(pid));
      }else{
         deptIdList = SysCache.getDeptChildIds(null);
      }
      return page.setRecords(baseMapper.selectDeptPages(page,equipment,deptIdList,dxdype));
   }



   @Override
   public List<EquipmentVOS> tree() {
      return ForestNodeMerger.merge(baseMapper.tree());