升级

SGGL/FineUIPro.Web/HSSE/Hazard/HazardList.aspx.cs

@@ -73,14 +73,13 @@ namespace FineUIPro.Web.HSSE.Hazard
         /// </summary>
         private void BindGrid()
         {
-            string strSql = "select HazardList.HazardListId,HazardList.VersionNo,HazardList.WorkStage,Users.UserName,HazardList.CompileDate,CodeRecords.Code AS HazardListCode,HazardList.WorkAreaName,HazardList.IdentificationDate,ControllingPersonUsers.UserName AS ControllingPersonName "
+            string strSql = "select HazardList.HazardListId,HazardList.VersionNo,HazardList.WorkStage,Users.UserName,HazardList.CompileDate,CodeRecords.Code AS HazardListCode,HazardList.WorkAreaName,HazardList.IdentificationDate,HazardList.ControllingPerson  "
                           + @" ,(CASE WHEN HazardList.States = " + BLL.Const.State_0 + " OR HazardList.States IS NULL THEN '待['+OperateUser.UserName+']提交' WHEN HazardList.States =  " + BLL.Const.State_2 + " THEN '审核/审批完成' ELSE '待['+OperateUser.UserName+']办理' END) AS  FlowOperateName"
                           + @" from Hazard_HazardList AS HazardList "
                           + @" LEFT JOIN Sys_FlowOperate AS FlowOperate ON HazardList.HazardListId=FlowOperate.DataId AND FlowOperate.IsClosed <> 1"
                           + @" LEFT JOIN Sys_User AS OperateUser ON FlowOperate.OperaterId=OperateUser.UserId "
                           + @" LEFT JOIN Sys_User AS Users ON HazardList.CompileMan=Users.UserId "
-                          + @" LEFT JOIN Sys_User AS ControllingPersonUsers ON HazardList.ControllingPerson=ControllingPersonUsers.UserId "
-                          + @" LEFT JOIN Sys_CodeRecords AS CodeRecords ON HazardList.HazardListId=CodeRecords.DataId WHERE 1=1 ";
+                           + @" LEFT JOIN Sys_CodeRecords AS CodeRecords ON HazardList.HazardListId=CodeRecords.DataId WHERE 1=1 ";
             List<SqlParameter> listStr = new List<SqlParameter>();
             strSql += " AND HazardList.ProjectId = @ProjectId";
             if (!string.IsNullOrEmpty(Request.Params["projectId"]))  ///是否文件柜查看页面传项目值
@@ -508,6 +507,19 @@ namespace FineUIPro.Web.HSSE.Hazard
                 PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("~/ReportPrint/ExReportPrint.aspx?reportId={0}&&replaceParameter={1}&&varValue={2}", Const.HazardListImportantReportId, Grid1.SelectedRowID, "", "打印 - ")));
             }
         }
+
+        public string BindControllingPerson(object ids)
+        {
+            string res = "";
+
+            if (ids != null)
+            {
+                res = UserService.getUserNamesUserIds(ids);
+
+            }
+            return res;
+        }
+
         #endregion
     }
 }