Merge branch 'master' of http://47.108.235.38:8080/r/zhengcaioa

username@email.com

2021-06-28 ed3015095f1b0e88bc579877c678a3fac191381f

 zhengcaioa/Services/SimService.cs

@@ -374,7 +374,19 @@
                    year = int.Parse(searchEntity.searchtime);
                }
                
                var dt = (from c in _context.SimCostYearView where c.bill_year==year orderby c.sim select c).ToList();
                var dt = (from c in _context.SimCostYearView where c.bill_year==year select c).ToList();
                //添加未有记录的
                var stringId = dt.Select(c => c.sim_id).ToList();
                var nolog = (from c in _context.SimBindView where !stringId.Contains(c.Id) select c).ToList();
                foreach(var item in nolog)
                {
                    SimCostYearView ss = new SimCostYearView();
                    ss.bill_year = year;
                    ss.sim_id = item.Id;
                    ss.sim = item.simcard;
                    dt.Add(ss);
                }
                dt = dt.OrderBy(c => c.sim).ToList();

                if (!string.IsNullOrEmpty(searchEntity.searchsim))
                {