From addedb6e27a0eff756ff3cabdd7dd2295ade5414 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 30 Oct 2023 14:41:52 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb
---
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