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

fix:升级

Browse Source
This commit is contained in:
geh
2025-06-19 19:23:01 +08:00
parent 0cb37e2c02
commit 7aa8baadbb
111 changed files with 14465 additions and 1480 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SUBQHSE/FineUIPro.Web/ZHGL/Emergency/EmergencyList.aspx.cs
+21 -14
View File
@@ -37,12 +37,13 @@ namespace FineUIPro.Web.ZHGL.Emergency
Funs.DropDownPageSize(this.ddlPageSize);
////权限按钮方法
this.GetButtonPower();
var thisUnit = CommonService.GetIsThisUnit();
if (thisUnit != null)
{
this.UnitId = thisUnit.UnitId;
}
//var thisUnit = CommonService.GetIsThisUnit();
//if (thisUnit != null)
//{
// this.UnitId = thisUnit.UnitId;
//}
BLL.UnitService.InitBranchUnitDropDownList(this.drpUnitId, true);
//BLL.UnitService.InitUnitDropDownList(this.drpUnitId, this.ProjectId, true);
//if (BLL.ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.ProjectId, this.CurrUser.UnitId))
//{
@@ -76,16 +77,16 @@ namespace FineUIPro.Web.ZHGL.Emergency
+ @" LEFT JOIN Sys_User AS ApproveMan ON ApproveMan.UserId=EmergencyList.ApproveMan"
+ @" LEFT JOIN Sys_User AS Users ON EmergencyList.CompileMan=Users.UserId WHERE 1=1 ";
List<SqlParameter> listStr = new List<SqlParameter>();
strSql += " AND EmergencyList.UnitId = @UnitId";
//strSql += " AND EmergencyList.UnitId = @UnitId";
if (!string.IsNullOrEmpty(this.UnitId)) ///是否文件柜查看页面传项目值
{
listStr.Add(new SqlParameter("@UnitId", this.UnitId));
//listStr.Add(new SqlParameter("@UnitId", this.UnitId));
strSql += " AND EmergencyList.States = @States"; ///状态为已完成
listStr.Add(new SqlParameter("@States", BLL.Const.State_2));
}
else
{
listStr.Add(new SqlParameter("@UnitId", this.UnitId));
//listStr.Add(new SqlParameter("@UnitId", this.UnitId));
}
if (!string.IsNullOrEmpty(this.txtEmergencyCode.Text.Trim()))
@@ -93,11 +94,11 @@ namespace FineUIPro.Web.ZHGL.Emergency
strSql += " AND EmergencyCode LIKE @EmergencyCode";
listStr.Add(new SqlParameter("@EmergencyCode", "%" + this.txtEmergencyCode.Text.Trim() + "%"));
}
//if (this.drpUnitId.SelectedValue != BLL.Const._Null)
//{
// strSql += " AND EmergencyList.UnitId = @UnitId";
// listStr.Add(new SqlParameter("@UnitId", this.drpUnitId.SelectedValue.Trim()));
//}
if (this.drpUnitId.SelectedValue != BLL.Const._Null)
{
strSql += " AND EmergencyList.UnitId = @UnitId";
listStr.Add(new SqlParameter("@UnitId", this.drpUnitId.SelectedValue.Trim()));
}
if (!string.IsNullOrEmpty(this.txtEmergencyName.Text.Trim()))
{
strSql += " AND EmergencyList.EmergencyName LIKE @EmergencyName";
@@ -260,6 +261,12 @@ namespace FineUIPro.Web.ZHGL.Emergency
this.btnMenuDelete.Hidden = false;
}
}
//if (string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
//{
// btnNew.Hidden = true;
// btnMenuEdit.Hidden = true;
// btnMenuDelete.Hidden = true;
//}
}
#endregion