解决冲突

刘磊

2024-12-17 58a5a9af83492c5bbb4fba88b4443f08fa4becfc

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseServices/ServiceBase.cs

@@ -82,7 +82,8 @@
            //}
            //GetPageDataOnExecuted?.Invoke(pageGridData);

            pageGridData = BaseDal.QueryPage(wheres, options.Page, options.Rows, orderbyDic);
            pageGridData = BaseDal.QueryPage
                (wheres, options.Page, options.Rows, orderbyDic);

            return pageGridData;
        }
@@ -129,7 +130,7 @@
                if (expressionType == LinqExpressionType.Equal)
                {
                    if (string.IsNullOrEmpty(where))
                        where += $"{searchParametersList[i].Name} = '{searchParametersList[i].Value}'";
                        where += $"{searchParametersList[i].Name} like '%{searchParametersList[i].Value}%'";
                    else
                        where += $" and {searchParametersList[i].Name} = '{searchParametersList[i].Value}'";
                }