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

Merge branch 'master' of http://121.41.2.71:3000/wyw/mh_jy_safe

Browse Source
This commit is contained in:
wyw 2025-12-01 22:22:47 +08:00
commit 6e6ecae387
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
APT.MicroApi/APT.FO.WebApi/Controllers/PreShiftMeetingRecordController.cs
View File

@ -159,8 +159,8 @@ namespace APT.FO.WebApi.Controllers.Api.FO
else else
{ {
var currTeam = GetEntity<T_FM_TEAM>(t => t.DEPARTMENT_ID == entity.DEPARTMENT_ID); var currTeam = GetEntity<T_FM_TEAM>(t => t.DEPARTMENT_ID == entity.DEPARTMENT_ID);
entity.TEAM_ID = currTeam.ID; entity.TEAM_ID = currTeam?.ID;
TeamName = currTeam.NAME; TeamName = currTeam?.NAME;
} }
if (entity.NAME == null) if (entity.NAME == null)
{ {

8
APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskEvaluationController.cs
View File

@ -153,28 +153,28 @@ namespace APT.SK.WebApi.Controllers.Api
{ {
if (!string.IsNullOrEmpty(item.DEPARTMENT_TYPE) && !item.DEPARTMENT_TYPE.Contains("公司级")) 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 (item.EVALUATE_LEVEL == SKEvaluateLevelEnum.较大风险)
{ {
if (!string.IsNullOrEmpty(item.DEPARTMENT_TYPE) && !item.DEPARTMENT_TYPE.Contains("部门级") && !item.DEPARTMENT_TYPE.Contains("公司级")) 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 (item.EVALUATE_LEVEL == SKEvaluateLevelEnum.一般风险)
{ {
if (!string.IsNullOrEmpty(item.DEPARTMENT_TYPE) && !item.DEPARTMENT_TYPE.Contains("部门级") && !item.DEPARTMENT_TYPE.Contains("公司级") && !item.DEPARTMENT_TYPE.Contains("车间级")) 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 (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("班组级")) 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 + "行，低风险管控层级必须大于班组级");
} }
} }
} }