Commit 2e51cba9 authored by zhengjiawei's avatar zhengjiawei

bug

parent 10695ffd
...@@ -94,8 +94,12 @@ public class EquipmentSpecificController extends BaseController{ ...@@ -94,8 +94,12 @@ public class EquipmentSpecificController extends BaseController{
@RequestParam(value = "name",required = false) String name, @RequestParam(value = "name",required = false) String name,
@RequestParam(value = "pageNumber",required = false) int pageNumber, @RequestParam(value = "pageNumber",required = false) int pageNumber,
@RequestParam(value = "pageSize",required = false) int pageSize, @RequestParam(value = "pageSize",required = false) int pageSize,
@RequestParam(value = "equipmentId",required = false) Long equipmentId ) { @RequestParam(value = "equipmentId",required = false) String equipmentId ) {
return CommonResponseUtil.success(equipmentSpecificService.getEquipmentBySpeV2(name, pageNumber, pageSize,equipmentId)); Long aLong = null;
if (equipmentId != null && !"".equals(equipmentId.trim())){
aLong = Long.valueOf(equipmentId);
}
return CommonResponseUtil.success(equipmentSpecificService.getEquipmentBySpeV2(name, pageNumber, pageSize,aLong));
} }
@GetMapping(value = "/list-tree", produces = "application/json;charset=UTF-8") @GetMapping(value = "/list-tree", produces = "application/json;charset=UTF-8")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment