diff --git a/SUBQHSE/FineUIPro.Web/FineUIPro.Web.csproj b/SUBQHSE/FineUIPro.Web/FineUIPro.Web.csproj index ec45f5b..b86f715 100644 --- a/SUBQHSE/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SUBQHSE/FineUIPro.Web/FineUIPro.Web.csproj @@ -10490,7 +10490,7 @@ Fastreport.aspx - Component + ASPXCodeBehind Fastreport.aspx diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Check/CheckSpecialEdit.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/Check/CheckSpecialEdit.aspx.cs index da40c40..5b9fc4e 100644 --- a/SUBQHSE/FineUIPro.Web/HSSE/Check/CheckSpecialEdit.aspx.cs +++ b/SUBQHSE/FineUIPro.Web/HSSE/Check/CheckSpecialEdit.aspx.cs @@ -508,14 +508,20 @@ namespace FineUIPro.Web.HSSE.Check //} if (!string.IsNullOrEmpty(values.Value("HSEManage"))) { - /*string hsemange = values.Value("HSEManage").Split('-')[0]; - Sys_User user = Funs.DB.Sys_User.FirstOrDefault(x => x.UserName == hsemange); - - if (user != null) + string hsemange = values.Value("HSEManage"); + if (hsemange.Split('-').Length == 5) { - newDetail.HSEManage = user.UserId; - }*/ - newDetail.HSEManage = values.Value("HSEManage"); + newDetail.HSEManage = values.Value("HSEManage"); + } + else + { + var sysUser = BLL.ProjectUserService.GetProjectUserByUnitidAndProjectId(CurrUser.LoginProjectId, Const.HSSEManager); + Sys_User user = sysUser.FirstOrDefault(x => x.UserName == hsemange); + if (user != null) + { + newDetail.HSEManage = user.UserId; + } + } } if (values.Value("CompleteStatusName") == "已整改")