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

zzr99

2021-10-18 8552aecdfdf50a4eba5bb5df30bc32c8f5882763

 WorkM/Á÷ת¿¨¹ÜÀí/Sc_ProcessExchangeBillList.cs

@@ -53,11 +53,11 @@
            //过滤条件
            if (frmCondition.SqlStr.Trim().Length == 0)
            {
                sSql = "Select * from " + ViewName + " Where 1=1 " + sWhere + sDlgWhere + " order by å•æ®å· desc,hsubid  ";
                sSql = "Select * from " + ViewName + " Where 1=1 " + sWhere + sDlgWhere + " and HPRDORGID=" + DBUtility.ClsPub.HOrgID + " order by å•æ®å· desc,hsubid  ";
            }
            else
            {
                sSql = frmCondition.SqlStr + sWhere + sDlgWhere + " order by å•æ®å· desc,hsubid ";
                sSql = frmCondition.SqlStr + sWhere + sDlgWhere + " and HPRDORGID=" + DBUtility.ClsPub.HOrgID + " order by å•æ®å· desc,hsubid ";
            }

            //
@@ -858,6 +858,7 @@
            //    MessageBox.Show("没有输入条件!");
            //    return;
            //}
            sFastSQL = sFastSQL + " and HPRDORGID=" + DBUtility.ClsPub.HOrgID + "";
            sDlgWhere = sFastSQL;
            Display();
            sDlgWhere = "";