diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/PreShiftMeetingRecordController.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/PreShiftMeetingRecordController.cs index 74f99b8..abf6a44 100644 --- a/APT.MicroApi/APT.FO.WebApi/Controllers/PreShiftMeetingRecordController.cs +++ b/APT.MicroApi/APT.FO.WebApi/Controllers/PreShiftMeetingRecordController.cs @@ -159,8 +159,8 @@ namespace APT.FO.WebApi.Controllers.Api.FO else { var currTeam = GetEntity(t => t.DEPARTMENT_ID == entity.DEPARTMENT_ID); - entity.TEAM_ID = currTeam.ID; - TeamName = currTeam.NAME; + entity.TEAM_ID = currTeam?.ID; + TeamName = currTeam?.NAME; } if (entity.NAME == null) { diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskEvaluationController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskEvaluationController.cs index b439208..759db2d 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskEvaluationController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskEvaluationController.cs @@ -153,28 +153,28 @@ namespace APT.SK.WebApi.Controllers.Api { if (!string.IsNullOrEmpty(item.DEPARTMENT_TYPE) && !item.DEPARTMENT_TYPE.Contains("公司级")) { - throw new Exception("第" + item.NUM + "行,重大风险管控层级必须包含公司级"); + //throw new Exception("第" + item.NUM + "行,重大风险管控层级必须包含公司级"); } } if (item.EVALUATE_LEVEL == SKEvaluateLevelEnum.较大风险) { if (!string.IsNullOrEmpty(item.DEPARTMENT_TYPE) && !item.DEPARTMENT_TYPE.Contains("部门级") && !item.DEPARTMENT_TYPE.Contains("公司级")) { - throw new Exception("第" + item.NUM + "行,较大风险管控层级必须大于部门级"); + //throw new Exception("第" + item.NUM + "行,较大风险管控层级必须大于部门级"); } } if (item.EVALUATE_LEVEL == SKEvaluateLevelEnum.一般风险) { if (!string.IsNullOrEmpty(item.DEPARTMENT_TYPE) && !item.DEPARTMENT_TYPE.Contains("部门级") && !item.DEPARTMENT_TYPE.Contains("公司级") && !item.DEPARTMENT_TYPE.Contains("车间级")) { - throw new Exception("第" + item.NUM + "行,一般风险管控层级必须大于车间级"); + //throw new Exception("第" + item.NUM + "行,一般风险管控层级必须大于车间级"); } } if (item.EVALUATE_LEVEL == SKEvaluateLevelEnum.低风险) { if (!string.IsNullOrEmpty(item.DEPARTMENT_TYPE) && !item.DEPARTMENT_TYPE.Contains("部门级") && !item.DEPARTMENT_TYPE.Contains("公司级") && !item.DEPARTMENT_TYPE.Contains("车间级") && !item.DEPARTMENT_TYPE.Contains("班组级")) { - throw new Exception("第" + item.NUM + "行,低风险管控层级必须大于班组级"); + //throw new Exception("第" + item.NUM + "行,低风险管控层级必须大于班组级"); } } }