WebSVN – SmartDukaan – Diff – /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/AdminUser.java

                     subMenuMap.put(parentMenu, new ArrayList<>());
+                }
                 subMenuMap.get(parentMenu).add(menu);
+            }
+        }
+        // Sort submenus alphabetically by display text, then build the top-level list
+        Comparator<Menu> byDisplayText = Comparator.comparing(
+                m -> m.getDisplayText() == null ? "" : m.getDisplayText(),
+                String.CASE_INSENSITIVE_ORDER);
         subMenuMap.entrySet().stream().forEach(entry -> {
+            List<Menu> subs = entry.getValue();
+            subs.sort(byDisplayText);
-            entry.getKey().setSubMenus(entry.getValue());
+            entry.getKey().setSubMenus(subs);
             returnMenu.add(entry.getKey());
         });
+        // Sort the top-level menus alphabetically
+        returnMenu.sort(byDisplayText);
         return returnMenu;
+    }
     public Map<Integer, PartnerDetailModel> getWarehousePartnerDetail(Map<Integer, List<Integer>> warehousePartnerMap)
             throws Exception {

Subversion Repositories SmartDukaan