|
@@ -5277,9 +5277,16 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
|
|
|
|
|
|
|
|
conn.Commit();
|
|
conn.Commit();
|
|
|
|
|
|
|
|
- //data.Tables[0].TableName = "TQ1";
|
|
|
|
|
- data1.Tables[0].TableName = "TQ1";
|
|
|
|
|
- data.Merge(data1.Tables[0]);
|
|
|
|
|
|
|
+ if (data1.Tables.Count > 0)
|
|
|
|
|
+ {
|
|
|
|
|
+ //data.Tables[0].TableName = "TQ1";
|
|
|
|
|
+ data1.Tables[0].TableName = "TQ1";
|
|
|
|
|
+ data.Merge(data1.Tables[0]);
|
|
|
|
|
+ }
|
|
|
|
|
+ else
|
|
|
|
|
+ {
|
|
|
|
|
+ data.Tables.Add(new DataTable("TQ1"));
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
sre.Data = data;
|
|
sre.Data = data;
|
|
|
return sre;
|
|
return sre;
|