From 1f65fd011582ac6587d60475315d2ee6662d9d5b Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 08 Sep 2023 09:01:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' 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