同步祈禧代码

啊鑫

5 天以前 6b57612f6e9f7575d206e82955ffd989faaaf8b3

 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, "读取失败！");
    }

}