Merge branch 'master' of http://git.dongkesoft.com:9001/mes/hg5020

DK.Service/PDAModuleLogic/PDAModuleLogic.cs

@@ -989,15 +989,19 @@ namespace Dongke.IBOSS.PRD.Service.PDAModuleLogic
             try
             {
                 oracleConn.Open();
-                DataSet returnDs = oracleConn.GetSqlResultToDs(procsql);
-                if (returnDs != null && returnDs.Tables.Count > 0)
-                {
-                    return returnDs.Tables[0];
-                }
-                else
-                {
-                    return null;
-                }
+                DataTable returnDs = oracleConn.GetSqlResultToDt(procsql);
+
+                //xuwei fix 2020-04-24 取消null值 这可能会引起前端序列化json异常
+                return returnDs;
+
+                //if (returnDs != null && returnDs.Tables.Count > 0)
+                //{
+                //    return returnDs.Tables[0];
+                //}
+                //else
+                //{
+                //    return null;
+                //}
             }
             catch (Exception ex)
             {