add angular web add loading.

vnobo · Nov 4, 2023 · b0c64dc · b0c64dc
1 parent f6bf36e
commit b0c64dc
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/boot/platform/src/main/java/com/platform/boot/relational/menus/MenuRequest.java b/boot/platform/src/main/java/com/platform/boot/relational/menus/MenuRequest.java
@@ -22,10 +22,10 @@
 @ToString(callSuper = true)
 public class MenuRequest extends Menu {
 
-    private String icons;
-
     private Set<String> rules;
 
+    private String icons;
+
     @Valid
     private Set<MenuRequest> menus;
 
@@ -57,15 +57,17 @@ public Menu toMenu() {
     public Criteria toCriteria() {
         Criteria criteria = criteria(Set.of("permissions", "tenantCode", "icons", "menus", "rules"));
 
-        if (StringUtils.hasLength(getTenantCode())) {
-            criteria = criteria.and("tenantCode").is(this.getTenantCode());
+        Criteria tenantCriteria = Criteria.where("tenantCode").is("0");
+        if (StringUtils.hasLength(this.getTenantCode())) {
+            tenantCriteria = tenantCriteria.or("tenantCode").is(this.getTenantCode());
         }
+        criteria = criteria.and(tenantCriteria);
 
-        if (StringUtils.hasLength(getAuthority())) {
+        if (StringUtils.hasLength(this.getAuthority())) {
             criteria = criteria.and("authority").is(this.getAuthority());
         }
 
-        if (!ObjectUtils.isEmpty(getRules())) {
+        if (!ObjectUtils.isEmpty(this.getRules())) {
             criteria = criteria.and("authority").in(this.getRules());
         }