代码修改

OpenAuth.App/ServiceApp/TaxManage/TaxManagementApp.cs

@@ -180,20 +180,22 @@ namespace OpenAuth.App.ServiceApp.TaxManage
             var fw = await client.Queryable<TaxGongxianfang>()
                 .Where(r=>r.tjnd==DateTime.Now.Year.ToString())
                 .LeftJoin<TaxBuilding>((r, z) => r.zzwbm == z.jzwbm)
-                .GroupBy((r, z) => z.szzdbm)
-                .Select((r, z) => new CompanyData
+                .LeftJoin<TaxZongdi>((r,z,d)=>z.szzdbm==d.zdbm)
+                .GroupBy((r, z, d) => d.djqdm)
+                .Select((r, z, d) => new CompanyData
                 {
-                    name = z.szzdbm,
+                    name = d.djqdm,
                     data = (decimal)SqlFunc.AggregateSumNoNull(r.ndgx)
                 }).ToListAsync();
 
             //获取宗地贡献
             var zd = await client.Queryable<TaxGongxiandi>()
                  .Where(r => r.tjnd == DateTime.Now.Year.ToString())
-                .GroupBy(r => r.sszdbm)
-                .Select(r => new CompanyData
+                 .LeftJoin<TaxZongdi>((r,z)=>r.sszdbm==z.zdbm)
+                .GroupBy((r, z) => z.djqdm)
+                .Select((r, z) => new CompanyData
                 {
-                    name = r.sszdbm,
+                    name = z.djqdm,
                     data = (decimal)SqlFunc.AggregateSumNoNull(r.ndgx)
                 }).ToListAsync();
             List<TaxgongxianResponse> response = new List<TaxgongxianResponse>();