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

chenhaozhe

3 天以前 da84e4e72c9d9cc7e2bd40dc4bb7b3222ca3519a

 WebAPI/Controllers/ReportPlatFormController.cs

@@ -332,7 +332,7 @@

                ds = oCN.RunProcReturn("select * from h_v_Gy_UserButton where 用户名称='" + user+ "' order by 按钮排序", "h_v_Gy_UserButton");

                if (ds==null && ds.Tables[0].Rows.Count <= 0)
                if (ds.Tables[0]==null || ds.Tables[0].Rows.Count <1)
                {
                    ds = oCN.RunProcReturn("select * from h_v_Gy_UserButton where 用户名称='admin' order by 按钮排序", "h_v_Gy_UserButton");
                }