From 62750a4a726896b803fa0f7b1862c19f7bd04f4c Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期一, 10 二月 2025 14:37:23 +0800
Subject: [PATCH] 1.生产补料初步完成（拆分补料还未完成） 2.出库物料明细实体类调整
---
service/base/LoginService.cs | 55 +++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 49 insertions(+), 6 deletions(-)
diff --git a/service/base/LoginService.cs b/service/base/LoginService.cs
index d8147f3..cd24096 100644
--- a/service/base/LoginService.cs
+++ b/service/base/LoginService.cs
@@ -1,4 +1,5 @@
-锘縰sing NewPdaSqlServer.DB;
+锘縰sing System.Dynamic;
+using NewPdaSqlServer.DB;
using NewPdaSqlServer.entity;
using NewPdaSqlServer.util;
@@ -6,7 +7,6 @@
public class LoginService : RepositoryNoEntity
{
-
public SysUser login(string name, string pwd)
{
var strPass = UtilityHelper.MD5Encrypt32(pwd);
@@ -22,13 +22,56 @@
return sysUser;
}
- public List<MesSysPageview> getUserMenu(string name)
+ 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>();
if ("admin".Equals(name))
- return Db.Queryable<MesSysPageview>()
+ {
+ var groupedPageViews = pageViewList
+ .GroupBy(p =>
+ string.IsNullOrEmpty(p.PageGroup) ? "鏈垎缁�" : p.PageGroup)
.ToList();
+
+ foreach (var group in groupedPageViews)
+ {
+ dynamic groupObj = new ExpandoObject();
+ groupObj.groupName = group.Key; // 鍒嗙粍鍚�
+ groupObj.child = new List<MesSysPageview>();
+
+ foreach (var pageView in group)
+ {
+ var mesFile = Db.Queryable<MesFile>()
+ .Where(s => s.ParentGuid == pageView.Guid).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 = icoimg,
+ PageGroup = pageView.PageGroup,
+ PageIdx = pageView.PageIdx,
+ PageStatus = pageView.PageStatus
+ });
+ }
+
+ result.Add(groupObj);
+ }
+
+ return result;
+ }
+
return null;
}
@@ -37,7 +80,7 @@
{
login(name, pwd);
var passwordHash = UtilityHelper.MD5Encrypt32(newPwd);
-
+
return Db.Updateable<SysUser>()
.SetColumns(s => s.Password == passwordHash)
.Where(s => s.Account == name)
--
Gitblit v1.9.3