wyw/mh_jy_safe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: wyw:3e2447eac70329b2dfd1dcd8332d395650d61415
Branches Tags
wyw:master
...
compare: wyw:d20870f47ff8cda2689b49242272d656a8958fef
Branches Tags
wyw:master

2 Commits
3e2447eac7 ... d20870f47f

Author SHA1 Message Date
wyw
d20870f47f Merge branch 'master' of http://121.41.2.71:3000/wyw/mh_jy_safe 2026-04-22 11:07:33 +08:00
wyw
9fb665f9d5 部门 FM/Department/OrderPaged 添加 IS_DELETE 2026-04-22 11:07:08 +08:00
1 changed files with 18 additions and 4 deletions
Show Stats Expand all files Collapse all files

22
APT.MicroApi/APT.FM.WebApi/Controllers/Api/DepartmentController.cs
View File

@ -125,6 +125,20 @@ namespace APT.FM.WebApi.Controllers.Api.FM
pageFilter.FilterGroup.Rules.Add(filterRule); pageFilter.FilterGroup.Rules.Add(filterRule);
} }
FilterRule filterRuleDelete = new FilterRule();
filterRuleDelete.Field = "IS_DELETED";
filterRuleDelete.Value = "0";
filterRuleDelete.IsSysParamRule = false;
filterRuleDelete.Operate = FilterOperate.Equal;
if (pageFilter.FilterGroup.Rules == null)
{
pageFilter.FilterGroup.Rules = new List<FilterRule>();
pageFilter.FilterGroup.Rules.Add(filterRuleDelete);
}
else
{
pageFilter.FilterGroup.Rules.Add(filterRuleDelete);
}
return WitOrderPaged(null, pageFilter); return WitOrderPaged(null, pageFilter);
} }
/// <summary> /// <summary>
@ -431,7 +445,7 @@ namespace APT.FM.WebApi.Controllers.Api.FM
t.PRODUCTION_UNIT_ID = entity.PRODUCTION_UNIT_ID; t.PRODUCTION_UNIT_ID = entity.PRODUCTION_UNIT_ID;
T_FM_DEPARTMENT_PRODUCTION_UNIT unit = new T_FM_DEPARTMENT_PRODUCTION_UNIT(); T_FM_DEPARTMENT_PRODUCTION_UNIT unit = new T_FM_DEPARTMENT_PRODUCTION_UNIT();
unit.ORG_ID = t.ORG_ID; unit.DEPARTMENT_ID = t.ID; unit.ENUMS_ID = enumList?.ID; unit.ORG_ID = t.ORG_ID; unit.DEPARTMENT_ID = t.ID; unit.ENUMS_ID = enumList?.ID;
unit.Nav_Enums = null;unit.DEPART_UNIT_ID = entity.PRODUCTION_UNIT_ID; unit.Nav_Enums = null; unit.DEPART_UNIT_ID = entity.PRODUCTION_UNIT_ID;
unitList.Add(unit); unitList.Add(unit);
if (t.Nav_ProdutionUnit != null && t.Nav_ProdutionUnit.Any()) if (t.Nav_ProdutionUnit != null && t.Nav_ProdutionUnit.Any())
{ {
@ -457,7 +471,7 @@ namespace APT.FM.WebApi.Controllers.Api.FM
t.MineType = entity.MineType.ToString(); t.MineType = entity.MineType.ToString();
T_FM_USER_PRODUCTION_UNIT unit = new T_FM_USER_PRODUCTION_UNIT(); T_FM_USER_PRODUCTION_UNIT unit = new T_FM_USER_PRODUCTION_UNIT();
unit.ORG_ID = t.ORG_ID; unit.USER_ID = t.ID; unit.ENUMS_ID = enumList?.ID; unit.ORG_ID = t.ORG_ID; unit.USER_ID = t.ID; unit.ENUMS_ID = enumList?.ID;
unit.Nav_Enums = null;unit.PRODUCTION_UNIT_ID = entity.PRODUCTION_UNIT_ID; unit.Nav_Enums = null; unit.PRODUCTION_UNIT_ID = entity.PRODUCTION_UNIT_ID;
userUnitList.Add(unit); userUnitList.Add(unit);
if (t.Nav_ProdutionUnit != null && t.Nav_ProdutionUnit.Any()) if (t.Nav_ProdutionUnit != null && t.Nav_ProdutionUnit.Any())
{ {
@ -514,7 +528,7 @@ namespace APT.FM.WebApi.Controllers.Api.FM
main = entity; main = entity;
if (entity.Nav_DepartmentUser != null && entity.Nav_DepartmentUser.Any()) if (entity.Nav_DepartmentUser != null && entity.Nav_DepartmentUser.Any())
{ {
main.Nav_DepartmentUser = entity.Nav_DepartmentUser.Where(t => !t.Nav_User.CODE.Contains("admin")).OrderBy(m=>m.Nav_User.NUM).ToList(); main.Nav_DepartmentUser = entity.Nav_DepartmentUser.Where(t => !t.Nav_User.CODE.Contains("admin")).OrderBy(m => m.Nav_User.NUM).ToList();
} }
else else
{ {
@ -535,7 +549,7 @@ namespace APT.FM.WebApi.Controllers.Api.FM
departmentUser.Add(us); departmentUser.Add(us);
}); });
//main.Nav_DepartmentUser = departmentUser.OrderByDescending(e => e.Nav_User.APPROVE_ROLE_ID).ToList();//wyw 有审批角色的显示再前面 //main.Nav_DepartmentUser = departmentUser.OrderByDescending(e => e.Nav_User.APPROVE_ROLE_ID).ToList();//wyw 有审批角色的显示再前面
main.Nav_DepartmentUser = departmentUser.OrderBy(t=>t.Nav_User?.NUM).ThenByDescending(e => e.Nav_User.Nav_ApproveRole?.CODE).ToList(); main.Nav_DepartmentUser = departmentUser.OrderBy(t => t.Nav_User?.NUM).ThenByDescending(e => e.Nav_User.Nav_ApproveRole?.CODE).ToList();
} }
} }
} }