From d4a6d65f5e449c3e5464aa18ae97bf8953987217 Mon Sep 17 00:00:00 2001
From: LR-20210131IOQH\Administrator <jackcold@163.com>
Date: 星期二, 10 八月 2021 15:44:14 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/zhengcaioa
---
zhengcaioa/zhengcaioa/Controllers/settings/AreaController.cs | 51 +++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 43 insertions(+), 8 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Controllers/settings/AreaController.cs b/zhengcaioa/zhengcaioa/Controllers/settings/AreaController.cs
index 67a6dff..c19d832 100644
--- a/zhengcaioa/zhengcaioa/Controllers/settings/AreaController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/settings/AreaController.cs
@@ -13,7 +13,7 @@
namespace zhengcaioa.Controllers.settings
{
- [CheckLogin]
+
public class AreaController : Controller
{
private readonly ILogger<AreaController> _logger;
@@ -21,13 +21,13 @@
-
+ [CheckLogin]
public AreaController(ILogger<AreaController> logger, IAreaService areaService)
{
_logger = logger;
_areaService = areaService;
}
-
+ [CheckLogin]
public IActionResult Index()
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
@@ -51,7 +51,7 @@
return View();
}
-
+ [CheckLogin]
public string GetList(AreaDTOSearch search)
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
@@ -62,7 +62,7 @@
#region 缂栬緫
-
+ [CheckLogin]
public ActionResult Edit()
{
@@ -94,7 +94,7 @@
-
+ [CheckLogin]
public IActionResult Get(string id = null)
{
AreaDTO AreaDTO = new AreaDTO();
@@ -114,7 +114,7 @@
/// <param name="data">宀椾綅瀹炰綋绫诲璞�</param>
/// <returns></returns>
[HttpPost]
-
+ [CheckLogin]
public IActionResult Save(AreaDTO data)
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
@@ -133,12 +133,47 @@
/// <param name="info">瀹炰綋</param>
/// <returns></returns>
///
-
+ [CheckLogin]
public IActionResult Nullify(string Id = "")
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
ViewData["curentuser"] = curentuser;
return new JsonResult(_areaService.ModifyStatus(Id, curentuser.Id));
}
+
+
+
+
+ public IActionResult GetListArea()
+ {
+ ReturnMsg<List<AreaDTO>> returnMsg = new ReturnMsg<List<AreaDTO>>();
+ returnMsg.code = 1;
+ returnMsg.error = "";
+
+
+ List <AreaDTO> areaDTOs = _areaService.GetList();
+
+ List<AreaDTO> areaDTOshengs = areaDTOs.Where(x => x.ParentId == "0 ").ToList();
+
+
+ foreach(var areaDTOsheng in areaDTOshengs)
+ {
+ var childs = areaDTOs.Where(x => x.ParentId == areaDTOsheng.CodeId).ToList();
+ foreach(var child in childs)
+ {
+ child.Children = areaDTOs.Where(x => x.ParentId == child.CodeId).ToList();
+ }
+ areaDTOsheng.Children = childs;
+ }
+
+
+
+
+
+ returnMsg.returnObj = areaDTOshengs;
+ returnMsg.count = areaDTOs.Count;
+
+ return new JsonResult(returnMsg);
+ }
}
}
--
Gitblit v1.9.1