From 60f81ce58ccb481db36337dd744f15bd96f9141e Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 26 Apr 2021 10:54:45 +0800
Subject: [PATCH] 设备列表接口修改,根据部门id查询时修改为模糊查询
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java
index 8422b26..337de19 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java
@@ -204,6 +204,11 @@
/**
* 自定义分页(部门挂接)
+ * @param dxtype ???
+ * @param equipment 设备对象信息
+ * @param query 查询参数
+ * @param pid 组织机构Id
+ * @param response servlet 响应对象
*/
@GetMapping("/pageDept")
@ApiOperationSupport(order = 3)
@@ -222,6 +227,7 @@
String[] split = page.getRecords().get(j).getDeptId().split(",");
List<String> list = Arrays.asList(split);
StringBuffer deptNameBuiffer = new StringBuffer();
+ //数据匹配封装
for (String deptId:list) {
for (DeptVo deptVo:deptVos) {
if (deptId.equals(deptVo.getId().toString())){
--
Gitblit v1.9.3