From 054836957340aa6ee54b8261110bccbca2f8cb91 Mon Sep 17 00:00:00 2001
From: dongsk <dongsk@digiwin.com>
Date: Tue, 30 Apr 2024 18:27:00 +0800
Subject: [PATCH] no message

---
 .../app/provider/impl/BasicApiServiceImpl.java   | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/provider/impl/BasicApiServiceImpl.java b/demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/provider/impl/BasicApiServiceImpl.java
index b6d2d5a..89b9fd1 100644
--- a/demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/provider/impl/BasicApiServiceImpl.java
+++ b/demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/provider/impl/BasicApiServiceImpl.java
@@ -20,6 +20,7 @@ import org.apache.commons.lang.StringUtils;
 
 import javax.annotation.Resource;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -100,7 +101,20 @@ public class BasicApiServiceImpl implements BasicApiService {
         if (StringUtils.isNotBlank(sysId)) {
             lambdaQuery.eq(LayoutConfig::getSysId, sysId);
         }
-        return lambdaQuery.list();
+
+        List<LayoutConfig> list = lambdaQuery.list();
+
+        if (list.isEmpty()) {
+            lambdaQuery.clear();
+            lambdaQuery.eq(LayoutConfig::getUserId, "default");
+            lambdaQuery.eq(LayoutConfig::getTenantId, tenantId);
+            if (StringUtils.isNotBlank(sysId)) {
+                lambdaQuery.eq(LayoutConfig::getSysId, sysId);
+            }
+            list = lambdaQuery.list();
+        }
+
+        return list;
     }
 
 }