From 6e2b929cf381e2320ba6e7dec56c0371124d2b51 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期六, 27 八月 2022 15:03:00 +0800
Subject: [PATCH] 提交
---
zhengcaioa/zhengcaioa/Controllers/BizGroup/GroupGroupController.cs | 39 +++++++++++++++++++++++++++++----------
1 files changed, 29 insertions(+), 10 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Controllers/BizGroup/GroupGroupController.cs b/zhengcaioa/zhengcaioa/Controllers/BizGroup/GroupGroupController.cs
index d261f1c..bf31eda 100644
--- a/zhengcaioa/zhengcaioa/Controllers/BizGroup/GroupGroupController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/BizGroup/GroupGroupController.cs
@@ -30,8 +30,10 @@
private readonly IGroupGrouptypeService _grouptypeService;
private readonly IGroupTopicService _groupTopicService;
private readonly IHrDeptService _hrDeptService;
+ private readonly IPltPageService _pltPageService;
- public GroupGroupController(ILogger<GroupGroupController> logger, IGroupGroupService groupGroupService, ILiaotianService liaotianService, IUserService userService, IGroupGrouptypeService grouptypeService, IGroupTopicService groupTopicService, IHrDeptService hrDeptService)
+ public GroupGroupController(ILogger<GroupGroupController> logger, IGroupGroupService groupGroupService, ILiaotianService liaotianService, IUserService userService, IGroupGrouptypeService grouptypeService, IGroupTopicService groupTopicService, IHrDeptService hrDeptService
+ , IPltPageService pltPageService)
{
_logger = logger;
_groupGroupService = groupGroupService;
@@ -40,6 +42,7 @@
_groupTopicService = groupTopicService;
_userService = userService;
_hrDeptService = hrDeptService;
+ _pltPageService = pltPageService;
}
public IActionResult Index()
@@ -54,17 +57,31 @@
actionEntity.PageIco = "fa fa-search";
actionEntity.ActionName = "鏌ヨ";
actionlist.Add(actionEntity);
- 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, "/GroupGroup/Index/");
+ var pageEntities1 = pageEntities.Where(x => x.PageMethod == "01").ToList();
-
+ var pageEntities2 = pageEntities.Where(x => x.PageMethod == "02").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;
+ ViewData["ActionInfo2"] = pageEntities2;
ViewBag.hylb = _liaotianService.GetSYScode("CooperatecustomCustomer", "hyfl").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
@@ -90,7 +107,9 @@
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
ViewData["curentuser"] = curentuser;
-
+ var pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/GroupGroup/Index/");
+ var pageEntities2 = pageEntities.Where(x => x.PageMethod == "02").ToList();
+ ViewData["ActionInfo2"] = pageEntities2;
GroupGroupDTO dto = new GroupGroupDTO();
if (!String.IsNullOrEmpty(id))
{
--
Gitblit v1.9.1