This commit is contained in:
parent
a557ecdce6
commit
441fbf5985
|
@ -10490,7 +10490,7 @@
|
|||
</Compile>
|
||||
<Compile Include="HJGL\TrustManage\Fastreport.aspx.cs">
|
||||
<DependentUpon>Fastreport.aspx</DependentUpon>
|
||||
<SubType>Component</SubType>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
</Compile>
|
||||
<Compile Include="HJGL\TrustManage\Fastreport.aspx.designer.cs">
|
||||
<DependentUpon>Fastreport.aspx</DependentUpon>
|
||||
|
|
|
@ -508,14 +508,20 @@ namespace FineUIPro.Web.HSSE.Check
|
|||
//}
|
||||
if (!string.IsNullOrEmpty(values.Value<string>("HSEManage")))
|
||||
{
|
||||
/*string hsemange = values.Value<string>("HSEManage").Split('-')[0];
|
||||
Sys_User user = Funs.DB.Sys_User.FirstOrDefault(x => x.UserName == hsemange);
|
||||
|
||||
if (user != null)
|
||||
string hsemange = values.Value<string>("HSEManage");
|
||||
if (hsemange.Split('-').Length == 5)
|
||||
{
|
||||
newDetail.HSEManage = user.UserId;
|
||||
}*/
|
||||
newDetail.HSEManage = values.Value<string>("HSEManage");
|
||||
newDetail.HSEManage = values.Value<string>("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<string>("CompleteStatusName") == "已整改")
|
||||
|
|
Loading…
Reference in New Issue