Merge branch 'sprint/s4' into release/s4

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

@@ -77,7 +77,7 @@ public class BasicApiServiceImpl implements BasicApiService {
                 .eq(LayoutConfig::getTenantId, layoutConfig.getTenantId())
                 .eq(LayoutConfig::getSysId, layoutConfig.getSysId());
         if (lambdaQuery.exists()) {
-            layoutConfigService.lambdaUpdate()
+            return layoutConfigService.lambdaUpdate()
                     .set(LayoutConfig::getTop, layoutConfig.getTop())
                     .set(LayoutConfig::getLeft, layoutConfig.getLeft())
                     .set(LayoutConfig::getWidth, layoutConfig.getWidth())
@@ -87,10 +87,8 @@ public class BasicApiServiceImpl implements BasicApiService {
                     .eq(LayoutConfig::getSysId, layoutConfig.getSysId())
                     .update();
         } else {
-            layoutConfigService.save(layoutConfig);
+            return layoutConfigService.save(layoutConfig);
         }
-
-        return layoutConfigService.saveOrUpdate(layoutConfig);
     }
 
     @Override