Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

jinghz@oceic.com

2023-08-24 c5cfa2df88c6d2e5b31e87e1d5a8fe49d585f0bb

 WebAPI/Controllers/ÏîÄ¿¹ÜÀí/ÏîÄ¿½×¶Î/Gy_ProjectStageController.cs

@@ -203,12 +203,12 @@

                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_Gy_ProjectStage order by é˜¶æ®µç¼–码 ", "h_v_Gy_ProjectStage");
                    ds = oCN.RunProcReturn("select * from h_v_Gy_ProjectStage order by é˜¶æ®µç¼–码 desc", "h_v_Gy_ProjectStage");
                }
                else
                {
                    string sql1 = "select * from h_v_Gy_ProjectStage where 1 = 1 ";
                    string sql = sql1 + sWhere + " order by é˜¶æ®µç¼–码 ";
                    string sql = sql1 + sWhere + " order by é˜¶æ®µç¼–码 desc";
                    ds = oCN.RunProcReturn(sql, "h_v_Gy_ProjectStage");
                }

@@ -1732,12 +1732,12 @@

                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_PM_ProjectReportBillList order by å•æ®å· ", "h_v_PM_ProjectReportBillList");
                    ds = oCN.RunProcReturn("select * from h_v_PM_ProjectReportBillList order by å•æ®å· desc ", "h_v_PM_ProjectReportBillList");
                }
                else
                {
                    string sql1 = "select * from h_v_PM_ProjectReportBillList where 1 = 1 ";
                    string sql = sql1 + sWhere + " order by å•æ®å· ";
                    string sql = sql1 + sWhere + " order by å•æ®å· desc ";
                    ds = oCN.RunProcReturn(sql, "h_v_PM_ProjectReportBillList");
                }