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

取消喷水员和瓦检员必填

Browse Source
This commit is contained in:
何美荣 2025-11-26 16:38:08 +08:00
parent a15062eaab
commit 5a4659b7bf
2 changed files with 53 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
APT.MicroApi/APT.FO.WebApi/Controllers/FireJobController.cs
View File

@ -187,32 +187,32 @@ namespace APT.FO.WebApi.Controllers
{ {
throw new Exception("动火操作人员必须上传附件"); throw new Exception("动火操作人员必须上传附件");
} }
var wjUser = userTypes.FirstOrDefault(t => t.NAME == "瓦检员"); //var wjUser = userTypes.FirstOrDefault(t => t.NAME == "瓦检员");
if (wjUser == null) //if (wjUser == null)
{ //{
throw new Exception("人员类别未维护瓦检员，请到系统管理添加名称为瓦检员的人员类别"); // throw new Exception("人员类别未维护瓦检员，请到系统管理添加名称为瓦检员的人员类别");
} //}
else //else
{ //{
var wjUserHas = users.FirstOrDefault(t => t.USER_TYPE_ID == wjUser.ID); // var wjUserHas = users.FirstOrDefault(t => t.USER_TYPE_ID == wjUser.ID);
if (wjUserHas == null) // if (wjUserHas == null)
{ // {
throw new Exception("作业人员必须要有瓦检员"); // throw new Exception("作业人员必须要有瓦检员");
} // }
} //}
var psUser = userTypes.FirstOrDefault(t => t.NAME == "喷水人员"); //var psUser = userTypes.FirstOrDefault(t => t.NAME == "喷水人员");
if (psUser == null) //if (psUser == null)
{ //{
throw new Exception("人员类别未维护喷水人员，请到系统管理添加名称为喷水人员的人员类别"); // throw new Exception("人员类别未维护喷水人员，请到系统管理添加名称为喷水人员的人员类别");
} //}
else //else
{ //{
var psUserHas = users.FirstOrDefault(t => t.USER_TYPE_ID == psUser.ID); // var psUserHas = users.FirstOrDefault(t => t.USER_TYPE_ID == psUser.ID);
if (psUserHas == null) // if (psUserHas == null)
{ // {
throw new Exception("作业人员必须要有喷水人员"); // throw new Exception("作业人员必须要有喷水人员");
} // }
} //}
foreach (var item in users) foreach (var item in users)
{ {
item.ORG_ID = entity.ORG_ID; item.ORG_ID = entity.ORG_ID;

54
APT.MicroApi/APT.FO.WebApi/Controllers/FireJobWbController.cs
View File

@ -191,37 +191,37 @@ namespace APT.FO.WebApi.Controllers
{ {
throw new Exception("动火操作人员必须填写证书编号"); throw new Exception("动火操作人员必须填写证书编号");
} }
var dhfiles = users.FirstOrDefault(t => t.USER_TYPE_ID == dhUser.ID &&(t.Nav_UserFiles == null || !t.Nav_UserFiles.Any())); var dhfiles = users.FirstOrDefault(t => t.USER_TYPE_ID == dhUser.ID && (t.Nav_UserFiles == null || !t.Nav_UserFiles.Any()));
if (dhfiles != null) if (dhfiles != null)
{ {
throw new Exception("动火操作人员必须上传附件"); throw new Exception("动火操作人员必须上传附件");
} }
var wjUser = userTypes.FirstOrDefault(t => t.NAME == "瓦检员"); //var wjUser = userTypes.FirstOrDefault(t => t.NAME == "瓦检员");
if (wjUser == null) //if (wjUser == null)
{ //{
throw new Exception("人员类别未维护瓦检员，请到系统管理添加名称为瓦检员的人员类别"); // throw new Exception("人员类别未维护瓦检员，请到系统管理添加名称为瓦检员的人员类别");
} //}
else //else
{ //{
var wjUserHas = users.FirstOrDefault(t => t.USER_TYPE_ID == wjUser.ID); // var wjUserHas = users.FirstOrDefault(t => t.USER_TYPE_ID == wjUser.ID);
if (wjUserHas == null) // if (wjUserHas == null)
{ // {
throw new Exception("作业人员必须要有瓦检员"); // throw new Exception("作业人员必须要有瓦检员");
} // }
} //}
var psUser = userTypes.FirstOrDefault(t => t.NAME == "喷水人员"); //var psUser = userTypes.FirstOrDefault(t => t.NAME == "喷水人员");
if (psUser == null) //if (psUser == null)
{ //{
throw new Exception("人员类别未维护喷水人员，请到系统管理添加名称为喷水人员的人员类别"); // throw new Exception("人员类别未维护喷水人员，请到系统管理添加名称为喷水人员的人员类别");
} //}
else //else
{ //{
var psUserHas = users.FirstOrDefault(t => t.USER_TYPE_ID == psUser.ID); // var psUserHas = users.FirstOrDefault(t => t.USER_TYPE_ID == psUser.ID);
if (psUserHas == null) // if (psUserHas == null)
{ // {
throw new Exception("作业人员必须要有喷水人员"); // throw new Exception("作业人员必须要有喷水人员");
} // }
} //}
foreach (var item in users) foreach (var item in users)
{ {
item.ORG_ID = entity.ORG_ID; item.ORG_ID = entity.ORG_ID;