From 67a0042c5f29e4bb0e0b82f6190f2bc51480b45c Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 28 二月 2023 13:25:09 +0800
Subject: [PATCH] 工资绩效改版
---
zhengcaioa/zhengcaioa/Controllers/admin/AdmZhanghaomimaController.cs | 37 ++++++++++++++++++++++++++++---------
1 files changed, 28 insertions(+), 9 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Controllers/admin/AdmZhanghaomimaController.cs b/zhengcaioa/zhengcaioa/Controllers/admin/AdmZhanghaomimaController.cs
index 4e5136f..b55cffe 100644
--- a/zhengcaioa/zhengcaioa/Controllers/admin/AdmZhanghaomimaController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/admin/AdmZhanghaomimaController.cs
@@ -27,14 +27,16 @@
private readonly ILogger<AdmZhanghaomimaController> _logger;
private readonly ILiaotianService _liaotianService;
private readonly IAdmZhanghaomimaService _admZhanghaomimaService;
+ private readonly IPltPageService _pltPageService;
- public AdmZhanghaomimaController(ILogger<AdmZhanghaomimaController> logger, ILiaotianService liaotianService, IAdmZhanghaomimaService admZhanghaomimaService)
+ public AdmZhanghaomimaController(ILogger<AdmZhanghaomimaController> logger, ILiaotianService liaotianService, IAdmZhanghaomimaService admZhanghaomimaService, IPltPageService pltPageService)
{
_logger = logger;
_liaotianService = liaotianService;
_admZhanghaomimaService = admZhanghaomimaService;
+ _pltPageService = pltPageService;
}
@@ -56,19 +58,36 @@
- ActionEntity actionEntity1 = new ActionEntity();
- actionEntity1.OpenType = 0;
- actionEntity1.ActionUrl = "";
- actionEntity1.ActionFun = "Add";
- actionEntity1.PageIco = "fa fa-plus";
- actionEntity1.ActionName = "鏂板";
- actionlist.Add(actionEntity1);
+ //ActionEntity actionEntity1 = new ActionEntity();
+ //actionEntity1.OpenType = 0;
+ //actionEntity1.ActionUrl = "";
+ //actionEntity1.ActionFun = "Add";
+ //actionEntity1.PageIco = "fa fa-plus";
+ //actionEntity1.ActionName = "鏂板";
+ //actionlist.Add(actionEntity1);
+
+
+ var pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/AdmZhanghaomima/Index/");
+ var pageEntities1 = pageEntities.Where(x => x.PageMethod == "01").ToList();
+ foreach (var pageEntity in pageEntities1)
+ {
+ ActionEntity actionEntity1 = new ActionEntity();
+ actionEntity1.OpenType = pageEntity.OpenType;
+ actionEntity1.ActionUrl = "";
+ actionEntity1.ActionFun = pageEntity.PageShortcut;
+ actionEntity1.PageIco = pageEntity.PageIco;
+ actionEntity1.ActionName = pageEntity.PageName;
+ actionlist.Add(actionEntity1);
+ }
ViewData["ActionInfo"] = actionlist;
+
+ var pageEntities2 = pageEntities.Where(x => x.PageMethod == "02").ToList();
+ ViewData["ActionInfo2"] = pageEntities2;
@@ -87,7 +106,7 @@
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
ViewData["curentuser"] = curentuser;
- search.Creater = curentuser.Id;
+ //search.Creater = curentuser.Id;
//JsonResult jsonResult = new JsonResult(_liaotianService.SearchByPaging(search), new Newtonsoft.Json.Serialization.DefaultContractResolver());
return new JsonResult(_admZhanghaomimaService.SearchByPaging(search));
}
--
Gitblit v1.9.1