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 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; } }