From 90362d592d28927e5ab56f9b24f97d1f9089b50b Mon Sep 17 00:00:00 2001
From: cjl <chenjl@deyt.cn>
Date: Mon, 10 Jul 2023 21:36:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/qa' into qa
---
screen-api/src/main/java/com/moral/api/controller/OrganizationLayoutController.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/OrganizationLayoutController.java b/screen-api/src/main/java/com/moral/api/controller/OrganizationLayoutController.java
index a9ff956..e4d432d 100644
--- a/screen-api/src/main/java/com/moral/api/controller/OrganizationLayoutController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/OrganizationLayoutController.java
@@ -33,7 +33,7 @@
}
Map<String,Object> resultMap = organizationLayoutService.getLayoutByMac(parameters.get("mac").toString());
if (ObjectUtils.isEmpty(resultMap)){
- return null;
+ return ResultMessage.ok();
}
return ResultMessage.ok(resultMap);
}
--
Gitblit v1.8.0