From 81695c67562b55493a2e98263223c5440e28feed Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: Wed, 03 Aug 2022 14:18:58 +0800
Subject: [PATCH] 合并fix
---
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/controller/EquipmentTypeMngController.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/controller/EquipmentTypeMngController.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/controller/EquipmentTypeMngController.java
index cc0effa..108c648 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/controller/EquipmentTypeMngController.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/controller/EquipmentTypeMngController.java
@@ -41,10 +41,10 @@
*/
@PostMapping(value = "/page/list")
public ResultVO selectAll(@RequestBody PageQuery<EquipmentTypeMngQueryCriteria> pageQuery){
- PageUtils.checkCheck(pageQuery);
+ PageUtils.checkCheck(pageQuery);
return this.equipmentTypeMngService.queryAll(pageQuery);
}
-
+
/**
* 通过主键查询单条数据
@@ -79,10 +79,12 @@
* @param ids 主键结合
* @return 删除结果
*/
- @GetMapping(value = "/delete")
- public ResultVO delete(String ids) {
- List<String> idList = Arrays.stream(ids.split(","))
- .collect(Collectors.toList());
+ @RequestMapping(value = "/delete",method = RequestMethod.POST)
+ public ResultVO delete(@RequestBody Long[] ids) {
+ if(ids == null){
+ return new ResultVO<>(ResultCodes.CLIENT_PARAM_ILLEGAL);
+ }
+ List<Long> idList = Arrays.asList(ids);
this.equipmentTypeMngService.removeByIds(idList);
return new ResultVO<>(ResultCodes.OK);
}
@@ -97,4 +99,4 @@
public ResultVO treeData(){
return new ResultVO<>(ResultCodes.OK,this.equipmentTypeMngService.treeData(0L));
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.2