From 6e2b929cf381e2320ba6e7dec56c0371124d2b51 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期六, 27 八月 2022 15:03:00 +0800
Subject: [PATCH] 提交
---
zhengcaioa/Services/HrDeptService.cs | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/zhengcaioa/Services/HrDeptService.cs b/zhengcaioa/Services/HrDeptService.cs
index 4d2ea55..9408fe0 100644
--- a/zhengcaioa/Services/HrDeptService.cs
+++ b/zhengcaioa/Services/HrDeptService.cs
@@ -97,7 +97,7 @@
{
var entity = _context.HrDepts.Find(id);
- if (entity.RecStatus != "A")
+ if (entity==null || entity.RecStatus != "A")
{
entity = new HrDept();
}
@@ -177,6 +177,7 @@
&& (string.IsNullOrWhiteSpace(searchEntity.DeptType) || a.DeptType == searchEntity.DeptType.Trim())
&& (string.IsNullOrWhiteSpace(searchEntity.Superior) || (d != null && d.DeptName.Contains(searchEntity.Superior.Trim())))
&& (string.IsNullOrWhiteSpace(searchEntity.QiyongStatus) || a.QiyongStatus == searchEntity.QiyongStatus.Trim())
+ && (string.IsNullOrWhiteSpace(searchEntity.DeptnullName) || a.DeptName != searchEntity.DeptnullName.Trim())
select new HrDeptDTO
{
Id = a.Id,
@@ -265,20 +266,20 @@
public List<HrDeptDTO> GetList()
{
- StringBuilder sql = new StringBuilder();
- sql.Append(" with t as ");
- sql.Append(" ( select b.* from [hr_dept] b where b.[superior] = '' and b.rec_status='A' and b.qiyong_status='A' ");
- sql.Append(" union all ");
- sql.Append(" select a.* from [hr_dept] a join t b on a.[superior]=b.[Id] and a.rec_status='A' and a.qiyong_status='A' ) ");
- sql.Append(" select [Id],[dept_sn], replace(space((CAST([levels] as int)-1)*2)+[dept_name],' ','銆�') [dept_name],[director],[dept_type],[levels],[superior],[superior_top],[sort],[rec_status],[creater],[createtime],[modifier],[modifytime],[qiyong_status] ");
- sql.Append(" from t ");
+ //StringBuilder sql = new StringBuilder();
+ //sql.Append(" with t as ");
+ //sql.Append(" ( select b.* from [hr_dept] b where b.[superior] = '' and b.rec_status='A' and b.qiyong_status='A' ");
+ //sql.Append(" union all ");
+ //sql.Append(" select a.* from [hr_dept] a join t b on a.[superior]=b.[Id] and a.rec_status='A' and a.qiyong_status='A' ) ");
+ //sql.Append(" select [Id],[dept_sn], replace(space((CAST([levels] as int)-1)*2)+[dept_name],' ','銆�') [dept_name],[director],[dept_type],[levels],[superior],[superior_top],[sort],[rec_status],[creater],[createtime],[modifier],[modifytime],[qiyong_status] ");
+ //sql.Append(" from t ");
- var listPosition = _context.HrDepts.FromSqlRaw(sql.ToString()).ToList();
+ //var listPosition = _context.HrDepts.FromSqlRaw(sql.ToString()).ToList();
- var listPositionss = departmentRecursion("",listPosition);
-
- var list = _mapper.Map<List<HrDeptDTO>>(listPositionss);
+ //var listPositionss = departmentRecursion("",listPosition);
+ var listPosition = _context.HrDepts.Where(x=>x.RecStatus =="A" && x.QiyongStatus=="A" && x.DeptName!="鍏徃").OrderBy(x => x.DeptSn).ToList();
+ var list = _mapper.Map<List<HrDeptDTO>>(listPosition);
return list;
}
--
Gitblit v1.9.1