From 5a4659b7bf7ebfd2b33e351c31de600dff5179f3 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: Wed, 26 Nov 2025 16:38:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=E5=96=B7=E6=B0=B4=E5=91=98?= =?UTF-8?q?=E5=92=8C=E7=93=A6=E6=A3=80=E5=91=98=E5=BF=85=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/FireJobController.cs | 52 +++++++++--------- .../Controllers/FireJobWbController.cs | 54 +++++++++---------- 2 files changed, 53 insertions(+), 53 deletions(-) diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/FireJobController.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/FireJobController.cs index cf63aae..2d40d2d 100644 --- a/APT.MicroApi/APT.FO.WebApi/Controllers/FireJobController.cs +++ b/APT.MicroApi/APT.FO.WebApi/Controllers/FireJobController.cs @@ -187,32 +187,32 @@ namespace APT.FO.WebApi.Controllers { throw new Exception("动火操作人员必须上传附件"); } - var wjUser = userTypes.FirstOrDefault(t => t.NAME == "瓦检员"); - if (wjUser == null) - { - throw new Exception("人员类别未维护瓦检员，请到系统管理添加名称为瓦检员的人员类别"); - } - else - { - var wjUserHas = users.FirstOrDefault(t => t.USER_TYPE_ID == wjUser.ID); - if (wjUserHas == null) - { - throw new Exception("作业人员必须要有瓦检员"); - } - } - var psUser = userTypes.FirstOrDefault(t => t.NAME == "喷水人员"); - if (psUser == null) - { - throw new Exception("人员类别未维护喷水人员，请到系统管理添加名称为喷水人员的人员类别"); - } - else - { - var psUserHas = users.FirstOrDefault(t => t.USER_TYPE_ID == psUser.ID); - if (psUserHas == null) - { - throw new Exception("作业人员必须要有喷水人员"); - } - } + //var wjUser = userTypes.FirstOrDefault(t => t.NAME == "瓦检员"); + //if (wjUser == null) + //{ + // throw new Exception("人员类别未维护瓦检员，请到系统管理添加名称为瓦检员的人员类别"); + //} + //else + //{ + // var wjUserHas = users.FirstOrDefault(t => t.USER_TYPE_ID == wjUser.ID); + // if (wjUserHas == null) + // { + // throw new Exception("作业人员必须要有瓦检员"); + // } + //} + //var psUser = userTypes.FirstOrDefault(t => t.NAME == "喷水人员"); + //if (psUser == null) + //{ + // throw new Exception("人员类别未维护喷水人员，请到系统管理添加名称为喷水人员的人员类别"); + //} + //else + //{ + // var psUserHas = users.FirstOrDefault(t => t.USER_TYPE_ID == psUser.ID); + // if (psUserHas == null) + // { + // throw new Exception("作业人员必须要有喷水人员"); + // } + //} foreach (var item in users) { item.ORG_ID = entity.ORG_ID; diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/FireJobWbController.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/FireJobWbController.cs index d24f305..30f1fa8 100644 --- a/APT.MicroApi/APT.FO.WebApi/Controllers/FireJobWbController.cs +++ b/APT.MicroApi/APT.FO.WebApi/Controllers/FireJobWbController.cs @@ -191,37 +191,37 @@ namespace APT.FO.WebApi.Controllers { 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) { throw new Exception("动火操作人员必须上传附件"); } - var wjUser = userTypes.FirstOrDefault(t => t.NAME == "瓦检员"); - if (wjUser == null) - { - throw new Exception("人员类别未维护瓦检员，请到系统管理添加名称为瓦检员的人员类别"); - } - else - { - var wjUserHas = users.FirstOrDefault(t => t.USER_TYPE_ID == wjUser.ID); - if (wjUserHas == null) - { - throw new Exception("作业人员必须要有瓦检员"); - } - } - var psUser = userTypes.FirstOrDefault(t => t.NAME == "喷水人员"); - if (psUser == null) - { - throw new Exception("人员类别未维护喷水人员，请到系统管理添加名称为喷水人员的人员类别"); - } - else - { - var psUserHas = users.FirstOrDefault(t => t.USER_TYPE_ID == psUser.ID); - if (psUserHas == null) - { - throw new Exception("作业人员必须要有喷水人员"); - } - } + //var wjUser = userTypes.FirstOrDefault(t => t.NAME == "瓦检员"); + //if (wjUser == null) + //{ + // throw new Exception("人员类别未维护瓦检员，请到系统管理添加名称为瓦检员的人员类别"); + //} + //else + //{ + // var wjUserHas = users.FirstOrDefault(t => t.USER_TYPE_ID == wjUser.ID); + // if (wjUserHas == null) + // { + // throw new Exception("作业人员必须要有瓦检员"); + // } + //} + //var psUser = userTypes.FirstOrDefault(t => t.NAME == "喷水人员"); + //if (psUser == null) + //{ + // throw new Exception("人员类别未维护喷水人员，请到系统管理添加名称为喷水人员的人员类别"); + //} + //else + //{ + // var psUserHas = users.FirstOrDefault(t => t.USER_TYPE_ID == psUser.ID); + // if (psUserHas == null) + // { + // throw new Exception("作业人员必须要有喷水人员"); + // } + //} foreach (var item in users) { item.ORG_ID = entity.ORG_ID;