From e23023b93f34286f5a807b0b85e9a0619a297ed7 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 21 二月 2023 23:25:34 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-common/src/main/java/com/java110/common/cmd/machine/ListMachinesCmd.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/cmd/machine/ListMachinesCmd.java b/service-common/src/main/java/com/java110/common/cmd/machine/ListMachinesCmd.java
index c625138..4ca854d 100644
--- a/service-common/src/main/java/com/java110/common/cmd/machine/ListMachinesCmd.java
+++ b/service-common/src/main/java/com/java110/common/cmd/machine/ListMachinesCmd.java
@@ -90,6 +90,10 @@
MachineDto machineDto = BeanConvertUtil.covertBean(reqJson, MachineDto.class);
+ if (reqJson.containsKey("machineTypeCds") && !StringUtil.isEmpty(reqJson.getString("machineTypeCds"))) {
+ machineDto.setMachineTypeCds(reqJson.getString("machineTypeCds").split(","));
+ }
+
int count = machineInnerServiceSMOImpl.queryMachinesCount(machineDto);
List<ApiMachineDataVo> machines = null;
--
Gitblit v1.8.0