提交

username@email.com

2022-08-27 6e2b929cf381e2320ba6e7dec56c0371124d2b51

 zhengcaioa/zhengcaioa/Controllers/HR/HrDeptController.cs

@@ -20,16 +20,19 @@
        private readonly IHrDeptService _hrDeptService;
        private readonly ILiaotianService _liaotianService;
        private readonly IUserService _userService;
        
        private readonly IPltPageService _pltPageService;



        public HrDeptController(ILogger<HrDeptController> logger, IHrDeptService hrDeptService, ILiaotianService liaotianService, IUserService userService)

        public HrDeptController(ILogger<HrDeptController> logger, IHrDeptService hrDeptService, ILiaotianService liaotianService, IUserService userService
              , IPltPageService pltPageService)
        {
            _logger = logger;
            _hrDeptService = hrDeptService;
            _liaotianService = liaotianService;
            _userService = userService;
            _pltPageService = pltPageService;
        }


@@ -48,13 +51,27 @@
            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, "/HrDept/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;
            ViewBag.depttype = _liaotianService.GetSYScode("hr_dept", "dept_type").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
            ViewBag.qiyongstatus = _liaotianService.GetSYScode("system", "shifou").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
@@ -66,6 +83,7 @@
        {
            var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
            ViewData["curentuser"] = curentuser;
            search.DeptnullName = "公司";
            //JsonResult jsonResult =   new JsonResult(_liaotianService.SearchByPaging(search), new Newtonsoft.Json.Serialization.DefaultContractResolver());
            return JsonConvert.SerializeObject(_hrDeptService.SearchByPaging(search));
        }
@@ -79,20 +97,35 @@
            var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
            ViewData["curentuser"] = curentuser;
            List<ActionEntity> actionlist = new List<ActionEntity>();
            ActionEntity actionEntity = new ActionEntity();
            actionEntity.OpenType = 0;
            actionEntity.ActionUrl = "";
            actionEntity.ActionFun = "Save";
            actionEntity.PageIco = "glyphicon glyphicon-ok";
            actionEntity.ActionName = "保存";
            actionlist.Add(actionEntity);
            ActionEntity actionEntity1 = new ActionEntity();
            actionEntity1.OpenType = 0;
            actionEntity1.ActionUrl = "";
            actionEntity1.ActionFun = "Nullify";
            actionEntity1.PageIco = "fa fa-remove";
            actionEntity1.ActionName = "删除";
            actionlist.Add(actionEntity1);
            //ActionEntity actionEntity = new ActionEntity();
            //actionEntity.OpenType = 0;
            //actionEntity.ActionUrl = "";
            //actionEntity.ActionFun = "Save";
            //actionEntity.PageIco = "glyphicon glyphicon-ok";
            //actionEntity.ActionName = "保存";
            //actionlist.Add(actionEntity);
            //ActionEntity actionEntity1 = new ActionEntity();
            //actionEntity1.OpenType = 0;
            //actionEntity1.ActionUrl = "";
            //actionEntity1.ActionFun = "Nullify";
            //actionEntity1.PageIco = "fa fa-remove";
            //actionEntity1.ActionName = "删除";
            //actionlist.Add(actionEntity1);

            var pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/HrDept/Index/");
            var pageEntities1 = 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;
            ViewBag.depttype = _liaotianService.GetSYScode("hr_dept", "dept_type").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
            ViewBag.dept = _hrDeptService.GetList().Select(x => new { code = x.Id, label = x.DeptName }).ToList();