Merge branch 'yyk'

yuyou_x

2024-03-14 54b96e7255ebcafabdbae17050fc09d19b7e0cce

 Wms/WMS.BLL/SysServer/CustomerServer.cs

@@ -25,11 +25,12 @@
        }


        public List<CustomerDto> GetCustomerList(string name, int? type, string linkMan, string phone, int page, int limit, out int count)
        public List<CustomerDto> GetCustomerList(string no,string name, int? type, string linkMan, string phone, int page, int limit, out int count)
        {
            try
            {
                Expression<Func<SysCustomer, bool>> item = Expressionable.Create<SysCustomer>()
                    .AndIF(!string.IsNullOrWhiteSpace(no), it => it.CustomerNo.Contains(no.Trim()))
                    .AndIF(!string.IsNullOrWhiteSpace(name), it => it.CustomerName.Contains(name.Trim()))
                    .AndIF(type >= 0, it => it.Type == type)
                    .AndIF(!string.IsNullOrWhiteSpace(linkMan), it => it.LinkMan.Contains(linkMan.Trim()))