zhengcaioa/Services/CooperatecustomCustomerService.cs
@@ -173,14 +173,26 @@
            var query = (from a in _context.CooperatecustomCustomers
                         join b in listCode.Where(x => x.CodeTable == "CooperatecustomCustomer" && x.CodeField == "khly")
                         on a.Khly equals b.CodeSn
                         into bsss
                         from bbb in bsss.DefaultIfEmpty()
                         join c in listCode.Where(x => x.CodeTable == "CooperatecustomCustomer" && x.CodeField == "hyfl")
                         on a.Hyfl equals c.CodeSn
                          into csss
                         from ccc in csss.DefaultIfEmpty()
                         join d in listCode.Where(x => x.CodeTable == "CooperatecustomCustomer" && x.CodeField == "khlx")
                        on a.Khlx equals d.CodeSn
                         into dsss
                         from ddd in dsss.DefaultIfEmpty()
                         join e in _context.PltUsers.Where(x => x.RecStatus == "A" && x.Zhiwustatus == "A" && x.IsYwjl == "A")
                         on a.Ywjl equals e.Id
                         into esss
                         from abi in esss.DefaultIfEmpty()
                         join i in _context.CooperOrders.Where(x => x.RecStatus == "A" &&  x.ChedanStatus !="A" ).GroupBy(q => new { q.Khdw }).Select(q => new
                         {
                             Khdw = q.Key.Khdw,
@@ -191,9 +203,24 @@
                         on a.Id equals i.Khdw
                         into isss
                         from iii in isss.DefaultIfEmpty()
                         join f in _context.Areas on a.Sheng equals f.CodeId
                            into fsss
                         from fff in fsss.DefaultIfEmpty()
                         join g in _context.Areas on a.City equals g.CodeId
                            into gsss
                         from ggg in gsss.DefaultIfEmpty()
                         join h in _context.Areas on a.AreaId equals h.CodeId
                            into hsss
                         from hhh in hsss.DefaultIfEmpty()
                         where a.RecStatus == "A"
                          && (string.IsNullOrWhiteSpace(searchEntity.Createtime) || (a.Createtime >= Createtimestart && a.Createtime <= Createtimeend))
@@ -218,12 +245,12 @@
                             Hyfl = a.Hyfl,
                             Khlx = a.Khlx,
                             Ywjl = a.Ywjl,
                             ShengName = f.Name + "-" + g.Name+ "-" + h.Name,
                             CityName = g.Name,
                             AreaIdName = h.Name,
                             KhlyName = b.Comments,
                             HyflName = c.Comments,
                             KhlxName = d.Comments,
                             ShengName = fff.Name + "-" + ggg.Name+ "-" + hhh.Name,
                             CityName = ggg.Name,
                             AreaIdName = hhh.Name,
                             KhlyName = bbb.Comments,
                             HyflName = ccc.Comments,
                             KhlxName = ddd.Comments,
                             YwjlName = abi.UserName,
                             Name = a.Name,
                             Postal = a.Postal,
@@ -303,12 +330,22 @@
        /// 获取所有有效合作客户
        /// </summary>
        /// <returns></returns>
        public List<CooperatecustomCustomerDTO> GetList()
        public List<CooperatecustomCustomerDTO> GetList(string HuiyuanId = "", string Name = "")
        {
            var listPosition = _context.CooperatecustomCustomers.Where(r => r.RecStatus == "A").ToList();
            if (!string.IsNullOrEmpty(HuiyuanId))
            {
                listPosition = listPosition.Where(x => x.HuiyuanId == HuiyuanId).ToList();
            }
            if (!string.IsNullOrEmpty(Name))
            {
                listPosition = listPosition.Where(x => x.Name == Name).ToList();
            }
            var list = _mapper.Map<List<CooperatecustomCustomerDTO>>(listPosition);
            return list;
        }