获得所有机器的数量修改BUG

src/main/java/com/shawn/web/controller/TEquipmentController.java

@@ -133,8 +133,23 @@ public class TEquipmentController extends BaseController<TEquipment,TEquipmentEx
 	//获取机器数量
 	@PostMapping("/getMachineNum")
 	public ResponseEntity<?> getMachineNum(@RequestBody StatisticsParam param) {
-			String machineTotalNum = tEquipmentService.findMachineTotalNum(param);
-			String machineUseNum = tEquipmentService.findMachineUseNum(param);
+		String machineTotalNum ="";
+		String machineUseNum = "";
+		String equipmentId = param.getEquipmentId();
+		//判断是否又机器id传入
+		if(equipmentId!=null && equipmentId!=""){
+			Long id = Long.valueOf(equipmentId);
+			TEquipment equipment = tEquipmentService.selectEntityById(id);
+			Long adminId = equipment.getAdminId();
+			String dminId = String.valueOf(adminId);
+			param.setAdminId(dminId);
+			 machineTotalNum = tEquipmentService.findMachineTotalNum(param);
+			 machineUseNum = tEquipmentService.findMachineUseNum(param);
+		}else{
+			 machineTotalNum = tEquipmentService.findMachineTotalNum(param);
+			 machineUseNum = tEquipmentService.findMachineUseNum(param);
+		}
+
 			List<String> list = new ArrayList<>();
 			list.add(machineTotalNum);
 			list.add(machineUseNum);