xiaju
/
SGGL_JT
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

This commit is contained in:
夏菊 2025-04-29 14:45:13 +08:00
parent a557ecdce6
commit 441fbf5985
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SUBQHSE/FineUIPro.Web/FineUIPro.Web.csproj
View File

@ -10490,7 +10490,7 @@
</Compile> </Compile>
<Compile Include="HJGL\TrustManage\Fastreport.aspx.cs"> <Compile Include="HJGL\TrustManage\Fastreport.aspx.cs">
<DependentUpon>Fastreport.aspx</DependentUpon> <DependentUpon>Fastreport.aspx</DependentUpon>
<SubType>Component</SubType> <SubType>ASPXCodeBehind</SubType>
</Compile> </Compile>
<Compile Include="HJGL\TrustManage\Fastreport.aspx.designer.cs"> <Compile Include="HJGL\TrustManage\Fastreport.aspx.designer.cs">
<DependentUpon>Fastreport.aspx</DependentUpon> <DependentUpon>Fastreport.aspx</DependentUpon>

16
SUBQHSE/FineUIPro.Web/HSSE/Check/CheckSpecialEdit.aspx.cs
View File

@ -508,14 +508,20 @@ namespace FineUIPro.Web.HSSE.Check
//} //}
if (!string.IsNullOrEmpty(values.Value<string>("HSEManage"))) if (!string.IsNullOrEmpty(values.Value<string>("HSEManage")))
{ {
/*string hsemange = values.Value<string>("HSEManage").Split('-')[0]; string hsemange = values.Value<string>("HSEManage");
Sys_User user = Funs.DB.Sys_User.FirstOrDefault(x => x.UserName == hsemange); if (hsemange.Split('-').Length == 5)
{
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) if (user != null)
{ {
newDetail.HSEManage = user.UserId; newDetail.HSEManage = user.UserId;
}*/ }
newDetail.HSEManage = values.Value<string>("HSEManage"); }
} }
if (values.Value<string>("CompleteStatusName") == "已整改") if (values.Value<string>("CompleteStatusName") == "已整改")