From 8b5439ba2748f91720975f73e7479a751d6a452b Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Sat, 07 Oct 2023 14:55:52 +0800
Subject: [PATCH] Merge branch 'cjl' 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