diff --git a/HJGL_ZH/FineUIPro.Web/FineUIPro.Web.csproj b/HJGL_ZH/FineUIPro.Web/FineUIPro.Web.csproj
index 8375e0a..f3bcc53 100644
--- a/HJGL_ZH/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/HJGL_ZH/FineUIPro.Web/FineUIPro.Web.csproj
@@ -100,7 +100,7 @@
- ..\..\..\..\ZHJA_HJGL\HJGL_ZH\FineUIPro.Web\bin\ThoughtWorks.QRCode.dll
+ ..\..\..\鼎盛\HJGL_DS\HJGL_DS\FineUIPro.Web\bin\ThoughtWorks.QRCode.dll
diff --git a/HJGL_ZH/FineUIPro.Web/HJGL/CheckManage/PassFileOneQueStatistic.aspx.cs b/HJGL_ZH/FineUIPro.Web/HJGL/CheckManage/PassFileOneQueStatistic.aspx.cs
index cea3159..25171ce 100644
--- a/HJGL_ZH/FineUIPro.Web/HJGL/CheckManage/PassFileOneQueStatistic.aspx.cs
+++ b/HJGL_ZH/FineUIPro.Web/HJGL/CheckManage/PassFileOneQueStatistic.aspx.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Data.SqlClient;
using System.Data;
using BLL;
+using System.Linq;
namespace FineUIPro.Web.HJGL.CheckManage
{
diff --git a/HJGL_ZH/FineUIPro.Web/HJGL/WeldingReport/InspectionBatchItem.aspx.cs b/HJGL_ZH/FineUIPro.Web/HJGL/WeldingReport/InspectionBatchItem.aspx.cs
index 7262fde..2e5f01c 100644
--- a/HJGL_ZH/FineUIPro.Web/HJGL/WeldingReport/InspectionBatchItem.aspx.cs
+++ b/HJGL_ZH/FineUIPro.Web/HJGL/WeldingReport/InspectionBatchItem.aspx.cs
@@ -118,7 +118,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
{
string strSql = "select v.*,newid() as New_ID from (SELECT distinct * FROM HJGL_View_InspectionBatch WHERE 1=1";
List listStr = new List();
- if (this.drpProjectId.SelectedValue != null && this.drpProjectId.SelectedValue!="null")
+ if (this.drpProjectId.SelectedValue != null && this.drpProjectId.SelectedValue != "null")
{
strSql += " AND ProjectId = @ProjectId";
listStr.Add(new SqlParameter("@ProjectId", this.drpProjectId.SelectedValue));
@@ -155,7 +155,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
{
this.GetShowColumn(c.Columns);
}
-
+
}
#endregion
@@ -192,7 +192,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
// BindGrid();
//}
//#endregion
-
+
#region 分页
protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
{
@@ -227,7 +227,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
#endregion
#region 导出
-
+
/// 导出按钮
///
///
@@ -244,20 +244,20 @@ namespace FineUIPro.Web.HJGL.WeldingReport
// n++;
//}
- Model.Sys_UserShowColumns c = BLL.Sys_UserShowColumnsService.GetColumnsByUserId(this.CurrUser.UserId, "3");
- List columns = new List();
- if (c != null)
- {
- string[] items = c.Columns.Split(',');
- columns = new List(items);
- }
- else
- {
- for (int i=1; i <= Grid1.Columns.Count; i++)
- {
- columns.Add(i.ToString());
- }
- }
+ Model.Sys_UserShowColumns c = BLL.Sys_UserShowColumnsService.GetColumnsByUserId(this.CurrUser.UserId, "3");
+ List columns = new List();
+ if (c != null)
+ {
+ string[] items = ("0," + c.Columns).Split(',');
+ columns = new List(items);
+ }
+ else
+ {
+ for (int i = 1; i <= Grid1.Columns.Count; i++)
+ {
+ columns.Add(i.ToString());
+ }
+ }
Response.ClearContent();
string filename = Funs.GetNewFileName();
//string style = @"