From 1ceb6ae074bc40a687852ce0fcef1ff2aa9c5840 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 26 Apr 2021 17:29:37 +0800
Subject: [PATCH] 1.客户列表接口修改，新增返回字段 deptName 2.删除 system.out... 以往语句
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 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..189c26c 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())){
@@ -358,7 +364,6 @@
// catalogService.updateCatalog(deviceName,deviceNumber,pId);
// }
- System.out.println(equipment.getDeptId());
return R.status(equipmentService.saveOrUpdate(equipment));
}
@@ -394,7 +399,6 @@
equipmentService.saveImg(equipment);
}
- System.out.println(equipment.getDeptId());
return R.status(equipmentService.saveOrUpdate(equipment));
}
--
Gitblit v1.9.3