From 6f059a7f1def48d7dbc805bc43f17c84c9b5bfec Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期一, 15 七月 2024 09:32:30 +0800
Subject: [PATCH] 提交
---
zhengcaioa/zhengcaioa/Controllers/admin/AdmTongxunluController.cs | 41 ++++++++++++++++++++++++++++-------------
1 files changed, 28 insertions(+), 13 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Controllers/admin/AdmTongxunluController.cs b/zhengcaioa/zhengcaioa/Controllers/admin/AdmTongxunluController.cs
index 066271e..5756093 100644
--- a/zhengcaioa/zhengcaioa/Controllers/admin/AdmTongxunluController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/admin/AdmTongxunluController.cs
@@ -27,14 +27,17 @@
private readonly ILogger<AdmTongxunluController> _logger;
private readonly ILiaotianService _liaotianService;
private readonly IAdmTongxunluService _admTongxunluService;
+ private readonly IPltPageService _pltPageService;
- public AdmTongxunluController(ILogger<AdmTongxunluController> logger, ILiaotianService liaotianService, IAdmTongxunluService admTongxunluService) {
+ public AdmTongxunluController(ILogger<AdmTongxunluController> logger, ILiaotianService liaotianService, IAdmTongxunluService admTongxunluService
+ , IPltPageService pltPageService)
+ {
_logger = logger;
_liaotianService = liaotianService;
_admTongxunluService = admTongxunluService;
-
+ _pltPageService = pltPageService;
}
@@ -55,21 +58,32 @@
- 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, "/AdmTongxunlu/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;
ViewBag.TypeId = _liaotianService.GetSYScode("adm_tongxunlu", "type_id").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
@@ -86,7 +100,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(_admTongxunluService.SearchByPaging(search));
}
@@ -96,6 +110,7 @@
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
ViewData["curentuser"] = curentuser;
+
AdmTongxunluDTO dto = new AdmTongxunluDTO();
if (!String.IsNullOrEmpty(id))
{
--
Gitblit v1.9.1