diff --git a/app/admin/view/nk/user/auths.html b/app/admin/view/nk/user/auths.html
index 66981f0..efe25b8 100644
--- a/app/admin/view/nk/user/auths.html
+++ b/app/admin/view/nk/user/auths.html
@@ -84,7 +84,7 @@
 		<div class="layui-input-block">
 			<select name="group_id" lay-verify="required">
 				{volist name='user_group' id='vo'}
-				<option value="{$vo.id}" {if $vo.id==$address['auth_range']} selected {/if}>{$vo.name}</option>
+				<option value="{$vo.id}" {if $vo.id==$user['group_id']} selected {/if}>{$vo.name}</option>
 				{/volist}
 			</select>
 		</div>
diff --git a/app/api/controller/Article.php b/app/api/controller/Article.php
index c61bf41..f04e8a1 100644
--- a/app/api/controller/Article.php
+++ b/app/api/controller/Article.php
@@ -71,7 +71,7 @@ class Article extends BaseController
             //查询
             $select = Db::table('fa_article')->where($where)->page($page)->limit(20)
                 ->alias('a')
-                ->join('article_vote_side_tables avst',"a.id = avst.article_id and avst.end_time >=".date('Y-m-d'))
+                ->join(['article_vote_side_tables' => 'avst'],"a.id = avst.article_id and avst.end_time >=".date('Y-m-d'))
                 ->field('a.id,a.title,a.describe,a.user_id,a.view,a.view_time,a.image,a.end_time,a.is_solve,a.is_vote,a.is_nickname,a.video,a.category_type,avst.end_time as die_time')
                 ->order('a.id DESC')
                 ->select()->toArray();
@@ -82,7 +82,7 @@ class Article extends BaseController
             //查询
             $select = Db::table('fa_article')->where($where)->page($page)->limit(20)
                 ->alias('a')
-                ->join('article_vote_side_tables avst',"a.id = avst.article_id and avst.end_time <=".date('Y-m-d'))
+                ->join(['article_vote_side_tables' => 'avst'],"a.id = avst.article_id and avst.end_time <=".date('Y-m-d'))
                 ->field('a.id,a.title,a.describe,a.user_id,a.view,a.view_time,a.image,a.end_time,a.is_solve,a.is_vote,a.is_nickname,a.video,a.category_type,avst.end_time as die_time')
                 ->order('a.id DESC')->select()->toArray();
         }else{
@@ -649,12 +649,12 @@ class Article extends BaseController
                 }
             }
         }
-        $yishi = $model->alias('a')->join('fa_article_vote_side_tables b','a.id=b.article_id')->where($www)->where('a.category_id',162)->whereTime('b.end_time', '>', date('Y-m-d H:i:s'))->count();
-        $maodun = $model->alias('a')->join('article_comment b','a.id=b.vote_id')->where('a.is_solve', 1)->where($where)->where('a.category_id',147)->count();
-        $xiejiao = $model->alias('a')->join('article_comment b','a.id=b.vote_id')->where('a.is_solve', 1)->where($where)->where('a.category_id', 148)->count();
-        $saohei = $model->alias('a')->join('article_comment b','a.id=b.vote_id')->where('a.is_solve', 1)->where($where)->where('a.category_id', 149)->count();
-        $sos = $model->alias('a')->join('article_comment b','a.id=b.vote_id')->where('a.is_solve', 1)->where($where)->where('a.category_id', 150)->count();
-        $one_shuqiu = $model->alias('a')->join('article_comment b','a.id=b.vote_id')->where('a.is_solve', 1)->where($where)->where('a.category_id', 165)->count();
+        $yishi = $model->alias('a')->join(['fa_article_vote_side_tables' => 'b'],'a.id=b.article_id')->where($www)->where('a.category_id',162)->whereTime('b.end_time', '>', date('Y-m-d H:i:s'))->count();
+        $maodun = $model->alias('a')->join(['article_comment' => 'b'],'a.id=b.vote_id')->where('a.is_solve', 1)->where($where)->where('a.category_id',147)->count();
+        $xiejiao = $model->alias('a')->join(['article_comment' => 'b'],'a.id=b.vote_id')->where('a.is_solve', 1)->where($where)->where('a.category_id', 148)->count();
+        $saohei = $model->alias('a')->join(['article_comment' => 'b'],'a.id=b.vote_id')->where('a.is_solve', 1)->where($where)->where('a.category_id', 149)->count();
+        $sos = $model->alias('a')->join(['article_comment' => 'b'],'a.id=b.vote_id')->where('a.is_solve', 1)->where($where)->where('a.category_id', 150)->count();
+        $one_shuqiu = $model->alias('a')->join(['article_comment' => 'b'],'a.id=b.vote_id')->where('a.is_solve', 1)->where($where)->where('a.category_id', 165)->count();
         $select = [
             'yishi' => $yishi,
             'maodun' => $maodun,
@@ -710,7 +710,7 @@ class Article extends BaseController
             //查询
             $select = Db::table('fa_article')->where($where)->page($page)->limit(20)
                 ->alias('a')
-                ->join('article_vote_side_tables avst',"a.id = avst.article_id and avst.end_time >=".date('Y-m-d'))
+                ->join(['article_vote_side_tables' => 'avst'],"a.id = avst.article_id and avst.end_time >=".date('Y-m-d'))
                 ->field('a.id,a.title,a.describe,a.user_id,a.view,a.view_time,a.image,a.end_time,a.is_solve,a.is_vote,a.is_nickname,a.video,a.category_type,avst.end_time as die_time')
                 ->order('a.id DESC')
                 ->select()->toArray();
@@ -721,7 +721,7 @@ class Article extends BaseController
             //查询
             $select = Db::table('fa_article')->where($where)->page($page)->limit(20)
                 ->alias('a')
-                ->join('article_vote_side_tables avst',"a.id = avst.article_id and avst.end_time <=".date('Y-m-d'))
+                ->join(['article_vote_side_tables' => 'avst'],"a.id = avst.article_id and avst.end_time <=".date('Y-m-d'))
                 ->field('a.id,a.title,a.describe,a.user_id,a.view,a.view_time,a.image,a.end_time,a.is_solve,a.is_vote,a.is_nickname,a.video,a.category_type,avst.end_time as die_time')
                 ->order('a.id DESC')->select()->toArray();
         }else{
diff --git a/app/api/controller/Personal.php b/app/api/controller/Personal.php
index b6e8428..6022ce1 100644
--- a/app/api/controller/Personal.php
+++ b/app/api/controller/Personal.php
@@ -86,7 +86,7 @@ class Personal extends BaseController
         $whe[] = ['a.status', '=', 0];
         $page  = $this->request->get('page', 1);
         $limit = $this->request->get('limit', 10);
-        $list  = Db::table('fa_szxc_personal_news_comment')->alias('a')->join('fa_szxc_personal_news b', 'a.personal_news_id=b.id')->where($whe)->field('a.id,a.content,a.createtime,a.user_id,b.user_id as uid')->select()->toArray();
+        $list  = Db::table('fa_szxc_personal_news_comment')->alias('a')->join(['fa_szxc_personal_news'=> 'b'], 'a.personal_news_id=b.id')->where($whe)->field('a.id,a.content,a.createtime,a.user_id,b.user_id as uid')->select()->toArray();
         if ($list) {
             foreach ($list as $key => $value) {
                 $list[$key]['createtime']  = date('Y-m-d', $value['createtime']);
diff --git a/app/api/controller/Statistics.php b/app/api/controller/Statistics.php
index 08422de..d193610 100644
--- a/app/api/controller/Statistics.php
+++ b/app/api/controller/Statistics.php
@@ -71,12 +71,12 @@ class Statistics extends BaseController
         $num3 = Db::table('fa_szxc_information_usermsg')
             ->alias('m')
             ->where($where)
-            ->join('fa_szxc_information_insurance i','m.user_id=i.user_id and i.insurance_type!=219')->count();
+            ->join(['fa_szxc_information_insurance'=> 'i'],'m.user_id=i.user_id and i.insurance_type!=219')->count();
         //残疾人员
         $num5  = Db::table('fa_szxc_information_usermsg')
             ->alias('m')
             ->where($where)
-            ->join('fa_szxc_information_insurance i','m.user_id=i.user_id and i.whether_disabled!=112')->count();
+            ->join(['fa_szxc_information_insurance' => 'i'],'m.user_id=i.user_id and i.whether_disabled!=112')->count();
         $return = [
             ['value'=>$num1,'name'=>'特困人员'],
             ['value'=>$num2,'name'=>'高龄老人'],
@@ -140,7 +140,7 @@ class Statistics extends BaseController
             $map[] = ['village_id', '=', $village_id];
         }
         // 总耕地面积
-        $num1 = Db::table('fa_szxc_information_planting')->alias('a')->join('fa_szxc_information_usermsg b','a.user_id = b.user_id')->where($where)->sum('land_area');
+        $num1 = Db::table('fa_szxc_information_planting')->alias('a')->join(['fa_szxc_information_usermsg' => 'b'],'a.user_id = b.user_id')->where($where)->sum('land_area');
         //人均耕地面积
         $all = Db::table('fa_szxc_information_usermsg')->where($map)->whereStatus('=', 1)->count();
         if($all){
@@ -152,7 +152,7 @@ class Statistics extends BaseController
         //退林还耕面积
         $num3 = $num1*0.3;
         //种植物种类
-        $num4 = Db::table('fa_szxc_information_planting')->alias('a')->join('fa_szxc_information_usermsg b','a.user_id = b.user_id')->where($where)->column('crops_msg');
+        $num4 = Db::table('fa_szxc_information_planting')->alias('a')->join(['fa_szxc_information_usermsg' => 'b'],'a.user_id = b.user_id')->where($where)->column('crops_msg');
         $a = 0;
         foreach ($num4 as $k=>$v){
             $v = json_decode($v,true);
@@ -265,19 +265,19 @@ class Statistics extends BaseController
             $where[] =  ['b.village_id', '=', $village_id];
         }
         // 总耕地面积
-        $num1 = Db::table('fa_szxc_information_planting')->alias('a')->join('fa_szxc_information_usermsg b','a.user_id = b.user_id')->where('nature_of_land',70)->where($where)->sum('land_area');
+        $num1 = Db::table('fa_szxc_information_planting')->alias('a')->join(['fa_szxc_information_usermsg' => 'b'],'a.user_id = b.user_id')->where('nature_of_land',70)->where($where)->sum('land_area');
         //园地
-        $num2 = Db::table('fa_szxc_information_planting')->alias('a')->join('fa_szxc_information_usermsg b','a.user_id = b.user_id')->where('nature_of_land',69)->where($where)->sum('land_area');
+        $num2 = Db::table('fa_szxc_information_planting')->alias('a')->join(['fa_szxc_information_usermsg' => 'b'],'a.user_id = b.user_id')->where('nature_of_land',69)->where($where)->sum('land_area');
         //林地
-        $num3 = Db::table('fa_szxc_information_planting')->alias('a')->join('fa_szxc_information_usermsg b','a.user_id = b.user_id')->where('nature_of_land',214)->where($where)->sum('land_area');
+        $num3 = Db::table('fa_szxc_information_planting')->alias('a')->join(['fa_szxc_information_usermsg' => 'b'],'a.user_id = b.user_id')->where('nature_of_land',214)->where($where)->sum('land_area');
         //牧草地
-        $num4 = Db::table('fa_szxc_information_planting')->alias('a')->join('fa_szxc_information_usermsg b','a.user_id = b.user_id')->where('nature_of_land',215)->where($where)->sum('land_area');
+        $num4 = Db::table('fa_szxc_information_planting')->alias('a')->join(['fa_szxc_information_usermsg' => 'b'],'a.user_id = b.user_id')->where('nature_of_land',215)->where($where)->sum('land_area');
         //养殖
-        $num5 = Db::table('fa_szxc_information_planting')->alias('a')->join('fa_szxc_information_usermsg b','a.user_id = b.user_id')->where('nature_of_land',216)->where($where)->sum('land_area');
+        $num5 = Db::table('fa_szxc_information_planting')->alias('a')->join(['fa_szxc_information_usermsg' => 'b'],'a.user_id = b.user_id')->where('nature_of_land',216)->where($where)->sum('land_area');
         //坑塘
-        $num6 = Db::table('fa_szxc_information_planting')->alias('a')->join('fa_szxc_information_usermsg b','a.user_id = b.user_id')->where('nature_of_land',217)->where($where)->sum('land_area');
+        $num6 = Db::table('fa_szxc_information_planting')->alias('a')->join(['fa_szxc_information_usermsg' => 'b'],'a.user_id = b.user_id')->where('nature_of_land',217)->where($where)->sum('land_area');
         //农田水利设施用地
-        $num7 = Db::table('fa_szxc_information_planting')->alias('a')->join('fa_szxc_information_usermsg b','a.user_id = b.user_id')->where('nature_of_land',218)->where($where)->sum('land_area');
+        $num7 = Db::table('fa_szxc_information_planting')->alias('a')->join(['fa_szxc_information_usermsg' => 'b'],'a.user_id = b.user_id')->where('nature_of_land',218)->where($where)->sum('land_area');
         $return = [
             ['value'=>$num1,'name'=>'耕地面积'],
             ['value'=>$num2,'name'=>'园地'],