From 06287f58cd161d8daa0942a950ca62aa2e10c30f Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期一, 23 十二月 2024 13:21:52 +0800
Subject: [PATCH] 11

---
 service/base/LoginService.cs |   69 +++++++++++++++++++---------------
 1 files changed, 39 insertions(+), 30 deletions(-)

diff --git a/service/base/LoginService.cs b/service/base/LoginService.cs
index cc50b04..cd24096 100644
--- a/service/base/LoginService.cs
+++ b/service/base/LoginService.cs
@@ -24,45 +24,54 @@
 
     public List<dynamic> getUserMenu(string name)
     {
-        var sql = "";
-
         var pageViewList = Db.Queryable<MesSysPageview>()
-            .Where(s=>s.PageStatus == true).ToList();
-        
-        var result = new List<dynamic>();  
-        
+            .Where(s => s.PageStatus == true)
+            .OrderBy(s => s.PageIdx)
+            .ToList();
+
+        var result = new List<dynamic>();
+
         if ("admin".Equals(name))
         {
-            var groupedPageViews = pageViewList  
-                .GroupBy(p => string.IsNullOrEmpty(p.PageGroup) ? "鏈垎缁�" : p.PageGroup)  
+            var groupedPageViews = pageViewList
+                .GroupBy(p =>
+                    string.IsNullOrEmpty(p.PageGroup) ? "鏈垎缁�" : p.PageGroup)
                 .ToList();
-            
-            foreach (var group in groupedPageViews)  
-            {  
-                dynamic groupObj = new ExpandoObject();  
+
+            foreach (var group in groupedPageViews)
+            {
+                dynamic groupObj = new ExpandoObject();
                 groupObj.groupName = group.Key; // 鍒嗙粍鍚�  
-                groupObj.child = new List<MesSysPageview>();  
+                groupObj.child = new List<MesSysPageview>();
 
-                foreach (var pageView in group)  
-                {  
-                    groupObj.child.Add(new MesSysPageview()  
-                    {  
-                        Guid = pageView.Guid,  
-                        PageView = pageView.PageView,  
-                        Path = pageView.Path,  
-                        Icoimg = pageView.Icoimg,  
-                        PageGroup = pageView.PageGroup,  
-                        PageIdx = pageView.PageIdx,  
-                        PageStatus = pageView.PageStatus  
-                    });  
-                }  
+                foreach (var pageView in group)
+                {
+                    var mesFile = Db.Queryable<MesFile>()
+                        .Where(s => s.ParentGuid == pageView.Guid).First();
 
-                result.Add(groupObj);  
-            }  
-            
+                    var icoimg = "";
+                    if (mesFile != null)
+                        icoimg = "http://192.168.1.145:81/upload/" +
+                                 mesFile.UrlPath;
+
+                    groupObj.child.Add(new MesSysPageview
+                    {
+                        Guid = pageView.Guid,
+                        PageView = pageView.PageView,
+                        Path = pageView.Path,
+                        Icoimg = icoimg,
+                        PageGroup = pageView.PageGroup,
+                        PageIdx = pageView.PageIdx,
+                        PageStatus = pageView.PageStatus
+                    });
+                }
+
+                result.Add(groupObj);
+            }
+
             return result;
         }
-             
+
 
         return null;
     }

--
Gitblit v1.9.3