diff --git a/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs b/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs index 9b1620f..eac7a32 100644 --- a/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs +++ b/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs @@ -13715,8 +13715,8 @@ namespace APT.BaseData.Services.DomainServices } } var param = "部门级"; - var dminetype = departs.FirstOrDefault(t => t.ID == user.DEPARTMENT_ID).DEPARTMENT_TYPE; - if (dminetype == 5 || sum.ISCOMPANY == SKIsStoreEnum.Yes) + var dminetype = departs.FirstOrDefault(t => t.ID == user.DEPARTMENT_ID); + if (dminetype.DEPARTMENT_TYPE == 5 || sum.ISCOMPANY == SKIsStoreEnum.Yes || dminetype.DEPARTMENT_STATUS == 2) { param = "公司级"; } @@ -14718,8 +14718,8 @@ namespace APT.BaseData.Services.DomainServices } } var param = "部门级"; - var dminetype = departs.FirstOrDefault(t => t.ID == user.DEPARTMENT_ID).DEPARTMENT_TYPE; - if (dminetype == 5 || result.ISCOMPANY == SKIsStoreEnum.Yes) + var dminetype = departs.FirstOrDefault(t => t.ID == user.DEPARTMENT_ID); + if (dminetype.DEPARTMENT_TYPE == 5 || result.ISCOMPANY == SKIsStoreEnum.Yes || dminetype.DEPARTMENT_STATUS == 2) { param = "公司级"; } diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerConfirmController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerConfirmController.cs index 87af97c..49133d9 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerConfirmController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerConfirmController.cs @@ -124,7 +124,7 @@ namespace APT.SK.WebApi.Controllers.Api if (departmentType != null) { level = ((SKDepartmentTypeEnum)departmentType.DEPARTMENT_TYPE).GetDescription(); - if (departmentType.DEPARTMENT_STATUS != 1) + if (departmentType.DEPARTMENT_STATUS == 2) { level = "公司级"; } diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyDelayApplyController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyDelayApplyController.cs index b1a01d4..56194f8 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyDelayApplyController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyDelayApplyController.cs @@ -58,7 +58,7 @@ namespace APT.SK.WebApi.Controllers.Api if (departmentType != null) { level = ((SKDepartmentTypeEnum)departmentType.DEPARTMENT_TYPE).GetDescription(); - if (departmentType.DEPARTMENT_STATUS != 1) + if (departmentType.DEPARTMENT_STATUS == 2) { level = "公司级"; } diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyRecordController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyRecordController.cs index d4cdc8a..4272f77 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyRecordController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyRecordController.cs @@ -195,7 +195,7 @@ namespace APT.SK.WebApi.Controllers if (departmentType != null) { level = ((SKDepartmentTypeEnum)departmentType.DEPARTMENT_TYPE).GetDescription(); - if (departmentType.DEPARTMENT_STATUS != 1) + if (departmentType.DEPARTMENT_STATUS == 2) { level = "公司级"; } diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerReportController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerReportController.cs index 2765fbd..2ec0e15 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerReportController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerReportController.cs @@ -211,7 +211,7 @@ namespace APT.SK.WebApi.Controllers.Api if (departmentType != null) { level = ((SKDepartmentTypeEnum)departmentType.DEPARTMENT_TYPE).GetDescription(); - if (departmentType.DEPARTMENT_STATUS != 1) + if (departmentType.DEPARTMENT_STATUS == 2) { level = "公司级"; } diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/IdentifyEvaluationPlanController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/IdentifyEvaluationPlanController.cs index cbccb01..0da4444 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/IdentifyEvaluationPlanController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/IdentifyEvaluationPlanController.cs @@ -128,8 +128,8 @@ namespace APT.SK.WebApi.Controllers.Api var department = this.GetEntity(t => t.ID == entity.APPLY_DEPARTMENT_ID && t.ENABLE_STATUS == 0); if (department != null) { - if (department.DEPARTMENT_TYPE == 5 || (department.NAME.Contains("安全环保") && department.DEPARTMENT_TYPE == 10)) - { param = "公司"; } + if (department.DEPARTMENT_STATUS == 2) + { param = "公司级"; } } entity.STATUS = PFStandardStatus.Approving; //取审批流水码 diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskEvaluationController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskEvaluationController.cs index c69d39e..b439208 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskEvaluationController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskEvaluationController.cs @@ -204,8 +204,12 @@ namespace APT.SK.WebApi.Controllers.Api //{ // throw new Exception("管控层级不能为空"); //} - var departmentType = this.GetEntity(t => t.ID == entity.APPLY_DEPARTMENT_ID && t.ENABLE_STATUS == 0)?.DEPARTMENT_TYPE; - var param = Enum.GetName(typeof(SKDepartmentTypeEnum), departmentType); + var department = this.GetEntity(t => t.ID == entity.APPLY_DEPARTMENT_ID && t.ENABLE_STATUS == 0); + var param = Enum.GetName(typeof(SKDepartmentTypeEnum), department.DEPARTMENT_TYPE); + if (department.DEPARTMENT_STATUS == 2) + { + param = "公司级"; + } entity.STATUS = PFStandardStatus.Approving; //取审批流水码 var sysFilter = new SystemCodeFilter(); diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyController.cs index 9454a73..c4c66c0 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyController.cs @@ -133,9 +133,9 @@ namespace APT.SK.WebApi.Controllers.Api { var department = this.GetEntity(t => t.ID == entity.APPLY_DEPARTMENT_ID && t.ENABLE_STATUS == 0); var param = Enum.GetName(typeof(SKDepartmentTypeEnum), department?.DEPARTMENT_TYPE); - if (department.PARENT_ID != null && param == "公司级") + if (department.DEPARTMENT_STATUS == 2) { - param = "部门级"; + param = "公司级"; } entity.STATUS = PFStandardStatus.Approving; //取审批流水码 diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyResultController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyResultController.cs index f2aac16..9061836 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyResultController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyResultController.cs @@ -160,8 +160,12 @@ namespace APT.SK.WebApi.Controllers.Api List notices = new List(); if (entity.PUBLISH != null && entity.PUBLISH.Equals("SaveAndNotify")) { - var departmentType = this.GetEntity(t => t.ID == entity.APPLY_DEPARTMENT_ID && t.ENABLE_STATUS == 0)?.DEPARTMENT_TYPE; - var param = Enum.GetName(typeof(SKDepartmentTypeEnum), departmentType); + var department = this.GetEntity(t => t.ID == entity.APPLY_DEPARTMENT_ID && t.ENABLE_STATUS == 0); + var param = Enum.GetName(typeof(SKDepartmentTypeEnum), department.DEPARTMENT_TYPE); + if (department.DEPARTMENT_STATUS == 2) + { + param = "公司级"; + } entity.STATUS = PFStandardStatus.Approving; //取审批流水码 var sysFilter = new SystemCodeFilter(); diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionNoticeController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionNoticeController.cs index d09d40f..3395848 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionNoticeController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionNoticeController.cs @@ -259,7 +259,7 @@ namespace APT.SK.WebApi.Controllers.Api if (department != null) { param = Enum.GetName(typeof(SKDepartmentTypeEnum), department.DEPARTMENT_TYPE); - if (department.DEPARTMENT_STATUS != 1) + if (department.DEPARTMENT_STATUS == 2) { param = "公司级"; }