lpf
/
SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://47.104.102.122:3000/lpf/SGGL_SeDin_New

This commit is contained in:
李鹏飞 2025-11-18 10:52:44 +08:00
parent 6f289814e8 ef0c9b41d7
commit 4a840fa05b
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SGGL/BLL/Common/CommonService.cs
View File

@ -403,7 +403,7 @@ namespace BLL
else else
{ {
var user = Person_PersonsService.GetPerson_PersonsById(userId); var user = Person_PersonsService.GetPerson_PersonsById(userId);
if (user != null && (user.UnitId == Const.UnitId_SEDIN || user.UnitId == Const.UnitId_SEDINNB)) if (user != null && (user.UnitId == Const.UnitId_SEDIN || user.UnitId == Const.UnitId_SEDINNB || user.UnitId == Const.UnitId_SEDINJH))
{ {
result = true; result = true;
} }

4
SGGL/BLL/Common/Const.cs
View File

@ -204,6 +204,10 @@ namespace BLL
/// </summary> /// </summary>
public const string UnitId_SEDINNB = "274fc39e-66e2-4bb9-8080-acb808499e82"; public const string UnitId_SEDINNB = "274fc39e-66e2-4bb9-8080-acb808499e82";
/// <summary> /// <summary>
/// 赛鼎焦化单位id
/// </summary>
public const string UnitId_SEDINJH = "2d2ffdfb-e2f7-430e-888a-240de2b12c06";
/// <summary>
/// 集团公司单位id /// 集团公司单位id
/// </summary> /// </summary>
public const string UnitId_CNCEC = "722090d1-b5de-4c3c-a4f7-14f308161a3b"; public const string UnitId_CNCEC = "722090d1-b5de-4c3c-a4f7-14f308161a3b";

2
SGGL/FineUIPro.Web/DataShow/SecurityRisk.aspx.cs
View File

@ -269,7 +269,7 @@ namespace FineUIPro.Web.DataShow
LEFT JOIN Hazard_HazardList AS B ON A.HazardListId=B.HazardListId LEFT JOIN Hazard_HazardList AS B ON A.HazardListId=B.HazardListId
where B.ProjectId=p.ProjectId AND B.States = '2' where B.ProjectId=p.ProjectId AND B.States = '2'
and (a.HazardLevel='4' or a.HazardLevel=(select top 1 RiskLevelId from Base_RiskLevel where RiskLevel='4'))),0) as Count4 and (a.HazardLevel='4' or a.HazardLevel=(select top 1 RiskLevelId from Base_RiskLevel where RiskLevel='4'))),0) as Count4
from Base_Project as P where ProjectState =1 "; from Base_Project as P where ProjectState =1 and IsCNCECShow=1 ";
List<SqlParameter> listStr = new List<SqlParameter>(); List<SqlParameter> listStr = new List<SqlParameter>();
SqlParameter[] parameter = listStr.ToArray(); SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);