From 2ba5117206c152cece2e5ac40067a6232dfb2870 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期三, 10 九月 2025 17:12:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
WebApi/Gs.BaseInfo/Services/SysDepartmentManager.cs | 32 +++++++++++++++-----------------
1 files changed, 15 insertions(+), 17 deletions(-)
diff --git a/WebApi/Gs.BaseInfo/Services/SysDepartmentManager.cs b/WebApi/Gs.BaseInfo/Services/SysDepartmentManager.cs
index bff1619..d97c88b 100644
--- a/WebApi/Gs.BaseInfo/Services/SysDepartmentManager.cs
+++ b/WebApi/Gs.BaseInfo/Services/SysDepartmentManager.cs
@@ -41,18 +41,17 @@
new StringBuilder(query.sortName + " " + query.sortOrder);
var totalCount = 0;
var itemsList = Db
- .Queryable<SysDepartment, SysOrganization, SysDepartment>((a,
- org, c) => new object[]
- {
- JoinType.Left, a.FSubsidiary == org.Fid,
- JoinType.Left, a.FParentID == c.Id.ToString()
- }).Select((a, org, c) => new SysDepartment
- {
- FSubsidiary = "(" + org.FNumber + ")" + org.Name,
- FParentID = c.Departmentname,
- Depextr4 = a.Depextr4 + ":" +
- (a.Depextr4 == "A" ? "姝ｅ父" : "绂佺敤")
- }, true)
+ .Queryable<SysDepartment, SysOrganization, SysDepartment>(
+ (a, org, c) => new object[]
+ {
+ JoinType.Left, a.FSubsidiary == org.Fid,
+ JoinType.Left, a.FParentID == c.Id.ToString()
+ }).Select((a, org, c) => new SysDepartment
+ {
+ FSubsidiary = "(" + org.FNumber + ")" + org.Name,
+ FParentID = c.Departmentname,
+ Depextr4 = a.Depextr4+":"+(a.Depextr4 == "A" ? "姝ｅ父" : "绂佺敤")
+ }, true)
.Where(_sbWhere.ToString())
.OrderBy(_sbBy.ToString())
.ToPageList(query.currentPage, query.everyPageSize,
@@ -65,7 +64,7 @@
}
catch (Exception ex)
{
- LogHelper.Debug(ToString(), ex.Message);
+ LogHelper.Debug(this.ToString(), ex.Message);
return ReturnDto<PageList<SysDepartment>>.QuickReturn(pageList,
ReturnCode.Default, ex.Message);
}
@@ -81,9 +80,8 @@
{
var m = base.GetById(model.Guid);
if (m != null)
- return ReturnDto<SysDepartment>.QuickReturn(m, ReturnCode.Success,
- "璇诲彇鎴愬姛锛�");
- return ReturnDto<SysDepartment>.QuickReturn(m, ReturnCode.Default,
- "璇诲彇澶辫触锛�");
+ return ReturnDto<SysDepartment>.QuickReturn(m, ReturnCode.Success, "璇诲彇鎴愬姛锛�");
+ return ReturnDto<SysDepartment>.QuickReturn(m, ReturnCode.Default, "璇诲彇澶辫触锛�");
}
+
}
\ No newline at end of file
--
Gitblit v1.9.3