From 9fb665f9d5c03c625460e2c59568b7e87a7e0e98 Mon Sep 17 00:00:00 2001 From: wyw <571921741@qq.com> Date: Wed, 22 Apr 2026 11:07:08 +0800 Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E9=97=A8=20=20=20FM/Department/OrderP?= =?UTF-8?q?aged=20=E6=B7=BB=E5=8A=A0=20IS=5FDELETE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/Api/DepartmentController.cs | 22 +++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/APT.MicroApi/APT.FM.WebApi/Controllers/Api/DepartmentController.cs b/APT.MicroApi/APT.FM.WebApi/Controllers/Api/DepartmentController.cs index 9ea6aa8..7e196ae 100644 --- a/APT.MicroApi/APT.FM.WebApi/Controllers/Api/DepartmentController.cs +++ b/APT.MicroApi/APT.FM.WebApi/Controllers/Api/DepartmentController.cs @@ -125,6 +125,20 @@ namespace APT.FM.WebApi.Controllers.Api.FM 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(); + pageFilter.FilterGroup.Rules.Add(filterRuleDelete); + } + else + { + pageFilter.FilterGroup.Rules.Add(filterRuleDelete); + } return WitOrderPaged(null, pageFilter); } /// @@ -431,7 +445,7 @@ namespace APT.FM.WebApi.Controllers.Api.FM t.PRODUCTION_UNIT_ID = entity.PRODUCTION_UNIT_ID; 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.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); 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_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.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); if (t.Nav_ProdutionUnit != null && t.Nav_ProdutionUnit.Any()) { @@ -514,7 +528,7 @@ namespace APT.FM.WebApi.Controllers.Api.FM main = entity; 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 { @@ -535,7 +549,7 @@ namespace APT.FM.WebApi.Controllers.Api.FM departmentUser.Add(us); }); //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(); } } }