From 1be2fc056943ba8b9e62328430e15beee03e8a9f Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期一, 02 六月 2025 13:46:48 +0800
Subject: [PATCH] 1.生产补料优化 2.首检开发-v1
---
service/base/LoginService.cs | 69 +++++++++++++++++++++++++++-------
1 files changed, 54 insertions(+), 15 deletions(-)
diff --git a/service/base/LoginService.cs b/service/base/LoginService.cs
index c4b5a68..89fcf9d 100644
--- a/service/base/LoginService.cs
+++ b/service/base/LoginService.cs
@@ -24,17 +24,33 @@
public List<dynamic> getUserMenu(string name)
{
- var sql = "";
-
- var pageViewList = Db.Queryable<MesSysPageview>()
- .Where(s => s.PageStatus == true)
- .OrderBy(s => s.PageIdx)
- .ToList();
-
- var result = new List<dynamic>();
-
+ var pageViewList = new List<MesSysPageview>();
if ("admin".Equals(name))
{
+ pageViewList = Db.Queryable<MesSysPageview>()
+ .Where(s => s.PageStatus == true)
+ .OrderBy(s => s.PageIdx)
+ .ToList();
+ }
+ else
+ {
+ string sql = string.Format(@"SELECT A.* FROM MES_SYS_PAGEVIEW A
+ LEFT JOIN SYS_USER_BIND B ON A.guid = B.aboutGuid
+ LEFT JOIN SYS_USER C ON C.GUID = B.userGuid
+ WHERE C.ACCOUNT = '{0}'", name);
+ pageViewList = Db.Ado.SqlQuery<MesSysPageview>(sql);
+ }
+
+ //if(pageViewList.Count < 0)
+ //{
+ // throw new Exception("璇ョ敤鎴锋病鏈夋潈闄愯闂�");
+ //}
+
+ try
+ {
+ var result = new List<dynamic>();
+
+
var groupedPageViews = pageViewList
.GroupBy(p =>
string.IsNullOrEmpty(p.PageGroup) ? "鏈垎缁�" : p.PageGroup)
@@ -49,15 +65,21 @@
foreach (var pageView in group)
{
var mesFile = Db.Queryable<MesFile>()
- .Where(s => s.ParentGuid == pageView.Guid).First();
+ .Where(s => s.ParentGuid == pageView.Guid)
+ .OrderByDescending(s => s.CreateDate)
+ .First();
+
+ 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 = "http://192.168.1.145:81/upload/" +
- mesFile.UrlPath,
+ Icoimg = icoimg,
PageGroup = pageView.PageGroup,
PageIdx = pageView.PageIdx,
PageStatus = pageView.PageStatus
@@ -68,10 +90,12 @@
}
return result;
+
}
-
-
- return null;
+ catch(Exception e)
+ {
+ throw new Exception(e.Message);
+ }
}
public int resetPassword(string newPwd, string name, string pwd)
@@ -84,4 +108,19 @@
.Where(s => s.Account == name)
.ExecuteCommand();
}
+
+
+ public List<dynamic> getUserInfo(string userGuid)
+ {
+
+ //string sql = string.Format(@"SELECT A.* FROM MES_SYS_PAGEVIEW A
+ // LEFT JOIN SYS_USER_BIND B ON A.guid = B.aboutGuid
+ // LEFT JOIN SYS_USER C ON C.GUID = B.userGuid
+ //WHERE C.ACCOUNT = '{0}'", userGuid);
+ //var sysUser = Db.Ado.SqlQuery<dynamic>(sql);
+
+
+ //return sysUser;
+ return null;
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3