Merge branch 'sprint/s4' into release/s4

demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/provider/impl/BasicApiServiceImpl.java

@@ -105,13 +105,13 @@ public class BasicApiServiceImpl implements BasicApiService {
         List<LayoutConfig> list = lambdaQuery.list();
 
         if (list.isEmpty()) {
-            lambdaQuery.clear();
-            lambdaQuery.eq(LayoutConfig::getUserId, "default");
-            lambdaQuery.eq(LayoutConfig::getTenantId, tenantId);
+            LambdaQueryChainWrapper<LayoutConfig> lambdaQueryX = layoutConfigService.lambdaQuery();
+            lambdaQueryX.eq(LayoutConfig::getUserId, "default");
+            lambdaQueryX.eq(LayoutConfig::getTenantId, tenantId);
             if (StringUtils.isNotBlank(sysId)) {
-                lambdaQuery.eq(LayoutConfig::getSysId, sysId);
+                lambdaQueryX.eq(LayoutConfig::getSysId, sysId);
             }
-            list = lambdaQuery.list();
+            list = lambdaQueryX.list();
         }
 
         return list;