From ca12247dbc0728c7900db4188565d4c4f7d907c4 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 29 八月 2023 09:25:54 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/DocumentService
---
DocumentServiceAPI.Application/DocManage/DocClassificationManageAppService.cs | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/DocumentServiceAPI.Application/DocManage/DocClassificationManageAppService.cs b/DocumentServiceAPI.Application/DocManage/DocClassificationManageAppService.cs
index de9221f..447649c 100644
--- a/DocumentServiceAPI.Application/DocManage/DocClassificationManageAppService.cs
+++ b/DocumentServiceAPI.Application/DocManage/DocClassificationManageAppService.cs
@@ -38,15 +38,15 @@
PageModel pg = new PageModel();
pg.PageSize = page.PageSize;
pg.PageIndex = page.PageIndex;
-
+
PageResult<Doc_Classification> result = new PageResult<Doc_Classification>();
if (page.Status.HasValue)
{
- result.Items = await _classificationService.GetPageListAsync(c => c.status ==page.Status && c.parent_code == page.Code, pg);
+ result.Items = await _classificationService.GetPageListAsync(c => c.status ==page.Status && c.parent_code == page.Code,pg,c=>c.sort_id,OrderByType.Asc);
}
else
{
- result.Items = await _classificationService.GetPageListAsync(c => c.parent_code == page.Code, pg);
+ result.Items = await _classificationService.GetPageListAsync(c => c.parent_code == page.Code, pg, c => c.sort_id, OrderByType.Asc);
}
result.TotalCount = pg.TotalCount;
result.PageIndex = pg.PageIndex;
@@ -62,7 +62,7 @@
public async Task<IActionResult> PostItemList(DocClassificationSearch page)
{
var data = await _classificationService.GetListAsync(c => c.status == 1 && c.parent_code == page.Code);
- return new JsonResult(data);
+ return new JsonResult(data.OrderBy(c=>c.sort_id).ToList());
}
/// <summary>
@@ -78,7 +78,7 @@
doc.doc_classification_code = "";
doc.is_system = false;
doc.parent_code = info.code;
- doc.sort_id = 99;
+ doc.sort_id = info.sort;
doc.status = info.status;
doc.tenant_code = info.tenant_id;
@@ -100,6 +100,7 @@
model.add_time = DateTime.Now;
model.doc_classification = info.name;
model.status = info.status;
+ model.sort_id = info.sort;
msg = await _classificationService.UpdateAsync(model);
}
--
Gitblit v1.9.1