diff --git a/app/admin/controller/nk/User.php b/app/admin/controller/nk/User.php
index 07b9c6c..86d3205 100644
--- a/app/admin/controller/nk/User.php
+++ b/app/admin/controller/nk/User.php
@@ -51,8 +51,15 @@ class User extends BaseController
                     if ($find['auth_range'] == 1) {
                         $mmm['area_id'] = $find['area_id'];
                         $mmm['street_id'] = $find['street_id'];
+                        $mmm['village_id'] = $find['village_id'];
                     } elseif ($find['auth_range'] == 2) {
                         $mmm['area_id'] = $find['area_id'];
+                        $mmm['street_id'] = $find['street_id'];
+                    }elseif ($find['auth_range'] == 5) {
+                        $mmm['area_id'] = $find['area_id'];
+                        $mmm['street_id'] = $find['street_id'];
+                        $mmm['village_id'] = $find['village_id'];
+                        $mmm['brigade_id'] = $find['brigade_id'];
                     }
                 }
             }
@@ -510,7 +517,15 @@ class User extends BaseController
                 $brigade_name = Db::table('fa_geo_brigade')->where('id', $params['brigade_id'])->value('brigade_name');
             }
             $address_name = $area_name . $street_name . $village['village_name'] . $brigade_name;
-
+            $useraddress = [
+                'area_id' => $params['area_id'],
+                'street_id' => $params['street_id'],
+                'village_code' => $params['village_id'],
+                'brigade_id' => $params['brigade_id'],
+                'auth_range' => $params['auth_range'],
+                'village_id' => $params['village_id'] != '' ? $village['village_id'] : 0,
+                'admin_id' =>  $admin['id'],
+            ];
             if ($admin) {
                 Db::startTrans();
                 try {
@@ -601,11 +616,6 @@ class User extends BaseController
                     // 修改商城关系表
                     $nk_user['n_user_id'] = $params['id'];
                     $is_nk_user = Db::connect('shop')->name('nk_user')->where($nk_user)->find();
-                    if ($is_nk_user) {
-                        $nk_data['group_id'] = $params['group_id'];
-                        Db::connect('shop')->name('nk_user')->where($nk_user)->update($nk_data);
-                    }
-
                     if ($is_have) {
                         $useraddress = [
                             'user_id' => $params['id'],
@@ -618,6 +628,11 @@ class User extends BaseController
                             'auth_range' => $params['auth_range'],
                         ];
                         Db::table('fa_szxc_information_useraddress')->where($w)->update($useraddress);
+                        if ($is_nk_user) {
+                            $useraddress['group_id'] = $params['group_id'];
+                            unset($useraddress['user_id'],$useraddress['admin_id']);
+                            Db::connect('shop')->name('nk_user')->where($nk_user)->update($useraddress);
+                        }
                     } else {
                         $useraddress = [
                             'user_id' => $params['id'],
@@ -679,17 +694,19 @@ class User extends BaseController
             }
         }
         //权限组信息
-        $groupwhere[] = ['id', 'in', [2,4]];
+        $groupwhere[] = ['id', '<>', 1];
         if ($this->adminInfo['group_access'] != 1) { //不是超级管理员
             // $www['admin_id'] = $this->adminInfo['id'];
             // $user_address = Db::table('fa_szxc_information_useraddress')->where($www)->find();
             // if ($user_address) {
             if ($this->adminInfo['group_access'] == 2) {
                 $auth_range = [['name' => '村级', 'value' => '1']];
-                $groupwhere[] = ['id', 'in', 2];
+                $groupwhere[] = ['id', '=', 2];
             }
             if ($this->adminInfo['group_access'] == 4) {
                 $auth_range = [['name' => '村级', 'value' => '1'], ['name' => '乡镇', 'value' => '2']];
+                $groupwhere['id'] = [ '=',[2,4]];
+
             }
             // if ($user_address['auth_range'] == 3) {
             //     $auth_range = [['name' => '村级', 'value' => '1'], ['name' => '乡镇', 'value' => '2'], ['name' => '区县', 'value' => '3']];
@@ -699,7 +716,7 @@ class User extends BaseController
             // }
             // }
         } else {
-            $auth_range = [['name' => '村级', 'value' => '1'], ['name' => '乡镇', 'value' => '2'], ['name' => '区县', 'value' => '3'], ['name' => '市级', 'value' => '4']];
+            $auth_range = [['name' => '小组', 'value' => '5'],['name' => '村级', 'value' => '1'], ['name' => '乡镇', 'value' => '2'], ['name' => '区县', 'value' => '3'], ['name' => '市级', 'value' => '4']];
         }
         $street = Db::table('fa_geo_area')->where(['switch' => 1, 'city_code' => '510500'])
             ->field('area_id id,area_code code,area_name name')
diff --git a/app/admin/view/nk/user/index.html b/app/admin/view/nk/user/index.html
index db73bfd..0ae3fad 100644
--- a/app/admin/view/nk/user/index.html
+++ b/app/admin/view/nk/user/index.html
@@ -43,6 +43,7 @@
 }
 </style>
 <div class="p-3 panel">
+	{if {:session('gougu_admin')['group_access']!=3}
 	<form class="layui-form gg-form-bar border-t border-x" style="display: inline-block;">
 		<div class="layui-input-inline" style="width:300px;">
 			<select name="area_id" class="form-control selectpicker" lay-filter="area_id">
@@ -75,6 +76,7 @@
 		</div>
 		<button class="layui-btn layui-btn-normal" lay-submit="" lay-filter="searcharea">提交</button>
 	</form>
+	{/if}
 	<form class="layui-form gg-form-bar border-t border-x" style="display: inline-block;">
 		<div class="layui-input-inline" style="width:300px;">
 			<input type="text" name="keywords" placeholder="请输入姓名" class="layui-input" autocomplete="off" />
@@ -99,10 +101,12 @@
 <script type="text/html" id="barDemo">
 <div class="layui-btn-group">
 	<a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="read">用户信息</a>
+	{if {:session('gougu_admin')['group_access']!=5}
 	<a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="auths">权限管理</a>
-	{if {:session('gougu_admin')['group_access']!=4}
-	<a class="layui-btn layui-btn-xs" lay-event="edit">信息维护</a>
 	{/if}
+	{notin  name=":session('gougu_admin')['group_access']" value="2,3,4,5"}
+	<a class="layui-btn layui-btn-xs" lay-event="edit">信息维护</a>
+	{/notin}
 	{if {:session('gougu_admin')['group_access']==1}
 	<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a></div>
 	{/if}
diff --git a/app/api/controller/Census.php b/app/api/controller/Census.php
index eec227c..288e1f9 100644
--- a/app/api/controller/Census.php
+++ b/app/api/controller/Census.php
@@ -58,7 +58,10 @@ class Census extends BaseController
         $num_1 = Db::connect('shop')->table('eb_merchant')->alias('a')->join('eb_merchant_address b','a.mer_id = b.mer_id')->where($mmm)->where($map)->count();
 
         //企业通过我们平台采购的农产品(差用户标签条件)
-        $num_3 = Db::connect('shop')->table('eb_user')->alias('a')->join('eb_nk_user b','a.uid = b.user_id')->join(['eb_product_order_log'=>'c'],'a.uid = c.uid')->join('nk_lihaink_cn.fa_szxc_information_useraddress d','b.n_user_id = d.user_id')->where($www)->where('a.status',1)->where('c.status',1)->count();
+        $num_3 = Db::connect('shop')->table('eb_user')->alias('a')->join('eb_nk_user b','a.uid = b.user_id')
+            ->join(['eb_product_order_log'=>'c'],'a.uid = c.uid')
+            ->join(['nk_lihaink_cn.fa_szxc_information_useraddress'=>'d'],'b.n_user_id = d.user_id')
+            ->where($www)->where('a.status',1)->where('c.status',1)->count();
 
         //镇农产品需求量分析（事业单位、企业、居民）
         //农产品市场行情分析、显示