From 0732f0c1dcce08da75561a12b2edb7533fd4e9ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=BE=8E=E8=8D=A3?= <10755671+mei-rong-he@user.noreply.gitee.com> Date: Sun, 30 Nov 2025 21:16:14 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=8F=AD=E5=89=8D=E4=BC=9A=E6=8A=A5?= =?UTF-8?q?=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/PreShiftMeetingRecordController.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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) { From 43f146c078e66d3fa12b986db6f0088297bc8e09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=BE=8E=E8=8D=A3?= <10755671+mei-rong-he@user.noreply.gitee.com> Date: Mon, 1 Dec 2025 16:33:27 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E5=8F=96=E6=B6=88?= =?UTF-8?q?=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/Api/RiskEvaluationController.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 + "行，低风险管控层级必须大于班组级"); } } }