diff --git a/app/admin/controller/Index.php b/app/admin/controller/Index.php
index 5a846ff..6506ab4 100644
--- a/app/admin/controller/Index.php
+++ b/app/admin/controller/Index.php
@@ -72,11 +72,10 @@ class Index extends BaseController
         $nation_s_num = Db::table('fa_szxc_information_usermsg')->where($where)->whereBetween('nation', [13, 68])->count();
 //        汉族
         $nation_h_num = Db::table('fa_szxc_information_usermsg')->where($where)->where('nation', 12)->count();
-//        土地性质
 
-        foreach ($where as $key =>$value){
-            $where[$key][0] = 'm.'.$value[0];
-        }
+//        foreach ($where as $key =>$value){
+//            $where[$key][0] = 'm.'.$value[0];
+//        }
         //        残疾人数
         $whether_disabled_num = Db::table('fa_szxc_information_usermsg')
             ->alias('m')
@@ -101,6 +100,39 @@ class Index extends BaseController
                 ->where('u.group_id',3)
                 ->join(['fa_szxc_information_usermsg'=>'m'],'u.id = m.user_id')->count();
         }
+        //土地
+        $land_area_num = Db::table('fa_szxc_information_useraddress')
+            ->alias('u')
+            ->where($where)
+            ->join(['fa_szxc_information_planting'=>'p'], 'u.user_id = p.user_id')->sum('p.land_area');
+        $sum_218 = Db::table('fa_szxc_information_useraddress')
+            ->alias('u')
+            ->where($where)
+            ->join(['fa_szxc_information_planting'=>'p'], 'u.user_id = p.user_id and p.nature_of_land=218')->sum('p.land_area');
+        $sum_217 = Db::table('fa_szxc_information_useraddress')
+            ->alias('u')
+            ->where($where)
+            ->join(['fa_szxc_information_planting'=>'p'], 'u.user_id = p.user_id and p.nature_of_land=217')->sum('p.land_area');
+        $sum_216 = Db::table('fa_szxc_information_useraddress')
+            ->alias('u')
+            ->where($where)
+            ->join(['fa_szxc_information_planting'=>'p'], 'u.user_id = p.user_id and p.nature_of_land=216')->sum('p.land_area');
+        $sum_215 = Db::table('fa_szxc_information_useraddress')
+            ->alias('u')
+            ->where($where)
+            ->join(['fa_szxc_information_planting'=>'p'], 'u.user_id = p.user_id and p.nature_of_land=215')->sum('p.land_area');
+        $sum_214 = Db::table('fa_szxc_information_useraddress')
+            ->alias('u')
+            ->where($where)
+            ->join(['fa_szxc_information_planting'=>'p'], 'u.user_id = p.user_id and p.nature_of_land=214')->sum('p.land_area');
+        $sum_70 = Db::table('fa_szxc_information_useraddress')
+            ->alias('u')
+            ->where($where)
+            ->join(['fa_szxc_information_planting'=>'p'], 'u.user_id = p.user_id and p.nature_of_land=70')->sum('p.land_area');
+        $sum_69 = Db::table('fa_szxc_information_useraddress')
+            ->alias('u')
+            ->where($where)
+            ->join(['fa_szxc_information_planting'=>'p'], 'u.user_id = p.user_id and p.nature_of_land=69')->sum('p.land_area');
         View::assign(
             [
                 'totaluser'            => $num,//User::where($whe)->count(),//        总用户数
@@ -113,6 +145,14 @@ class Index extends BaseController
                 'nation_s_num'         => $nation_s_num,
                 'nation_h_num'         => $nation_h_num,
                 'work_num'         => $work_num,
+                'land_area_num'  => $land_area_num,
+                'sum_218' => $sum_218,
+                'sum_217' => $sum_217,
+                'sum_216' => $sum_216,
+                'sum_215' => $sum_215,
+                'sum_214' => $sum_214,
+                'sum_70' => $sum_70,
+                'sum_69' => $sum_69,
             ]
         );
         return View();
diff --git a/app/admin/controller/nk/User.php b/app/admin/controller/nk/User.php
index 89eb960..d813bd1 100644
--- a/app/admin/controller/nk/User.php
+++ b/app/admin/controller/nk/User.php
@@ -119,7 +119,7 @@ class User extends BaseController
             } else {
                 $user_address['area_id'] = '';
                 $user_address['street_id'] = '';
-                $user_address['village_code'] = '';
+                $user_address['village_id'] = '';
                 $user_address['auth_range'] = '1';
                 $select = Db::table('fa_geo_area')->where('city_code', '510500')->select();
                 View::assign('row', $user_address);
@@ -129,7 +129,7 @@ class User extends BaseController
         } else {
             $user_address['area_id'] = '';
             $user_address['street_id'] = '';
-            $user_address['village_code'] = '';
+            $user_address['village_id'] = '';
             $user_address['auth_range'] = '';
             $select = Db::table('fa_geo_area')->where('city_code', '510500')->select();
             View::assign('row', $user_address);
@@ -745,13 +745,13 @@ class User extends BaseController
             }
         }
 
-        if ($post['village_id'] != '') {
+        if (!empty($post['village_id'])) {
             $where['village_id'] = $post['village_id'];
         }
-        if ($post['brigade_id'] != '') {
+        if (!empty($post['brigade_id'])) {
             $where['brigade_id'] = $post['brigade_id'];
         }
-        if ($post['street_id'] != '') {
+        if (!empty($post['street_id'])) {
             $where['street_id'] = $post['street_id'];
         }
         $where['area_id'] = $post['area_id'];
diff --git a/app/admin/view/index/main.html b/app/admin/view/index/main.html
index ad3af20..c37c858 100644
--- a/app/admin/view/index/main.html
+++ b/app/admin/view/index/main.html
@@ -78,9 +78,45 @@
 					</table>
 				</div>
 
-
-				<div class="layui-card">
-					<div id="chartView" style="width: 100%;height:300px;"></div>
+				<div class="layui-card dashboard-num">
+					<table>
+						<tr>
+							<td>
+								<div class="num-title">土地总面积</div>
+								<div class="blue">{$land_area_num}</div>
+							</td>
+							<td>
+								<div class="num-title">农田水利</div>
+								<div class="blue">{$sum_218}</div>
+							</td>
+							<td>
+								<div class="num-title">坑塘</div>
+								<div class="blue">{$sum_217}</div>
+							</td>
+							<td>
+								<div class="num-title">养殖</div>
+								<div class="blue">{$sum_216}</div>
+							</td>
+						</tr>
+						<tr>
+							<td>
+								<div class="num-title">牧草地</div>
+								<div class="blue">{$sum_215}</div>
+							</td>
+							<td>
+								<div class="num-title">林地</div>
+								<div class="blue">{$sum_214}</div>
+							</td>
+							<td>
+								<div class="num-title">耕地</div>
+								<div class="blue">{$sum_70}</div>
+							</td>
+							<td>
+								<div class="num-title">园地</div>
+								<div class="blue">{$sum_69}</div>
+							</td>
+						</tr>
+					</table>
 				</div>
 				<div class="layui-card">
 					<div id="chartYear" style="width: 100%;height:240px;"></div>
@@ -133,7 +169,7 @@
 				content:'<img src="'+src+'" style="width:100%" align=center />',
 			});
 		})
-		getLogs();
+		// getLogs();
 		//注册用户
 		table.render({
 			elem: '#UserList'