diff --git a/app/admin/controller/Index.php b/app/admin/controller/Index.php index d7712d6..fe33dae 100644 --- a/app/admin/controller/Index.php +++ b/app/admin/controller/Index.php @@ -45,7 +45,7 @@ class Index extends BaseController public function main() { if ($this->adminInfo['id']!=1){ - $find = Db::table('fa_szxc_information_useraddress')->where('user_id', $this->adminInfo['id'])->find(); + $find = Db::table('fa_szxc_information_useraddress')->where('user_id', $this->adminInfo['user_id'])->find(); if ($find) { if ($find['auth_range']==1){ $where[] = ['village_id', '=', $find['village_id']]; @@ -53,6 +53,8 @@ class Index extends BaseController $where[] = ['street_id', '=', $find['street_id']]; }elseif ($find['auth_range']==3){ $where[] = ['area_id', '=', $find['area_id']]; + }elseif ($find['auth_range']==5){ + $where[] = ['brigade_id', '=', $find['brigade_id']]; } } }else{ diff --git a/app/admin/controller/nk/Article.php b/app/admin/controller/nk/Article.php index 6387b0c..4059188 100644 --- a/app/admin/controller/nk/Article.php +++ b/app/admin/controller/nk/Article.php @@ -32,17 +32,12 @@ class Article extends BaseController $user_address = Db::table('fa_szxc_information_useraddress')->where($www)->find(); if ($user_address) { if ($user_address['auth_range'] == 1) { - $mmm['area_id'] = $user_address['area_id']; - $mmm['street_id'] = $user_address['street_id']; - $mmm['village_id'] = $user_address['village_id']; + $where[]= ['county','=',$user_address['area_id']]; + $where[] =['township','=', $user_address['street_id']]; + $where[] =['village','=', $user_address['village_id']]; } elseif ($user_address['auth_range'] == 2) { - $mmm['area_id'] = $user_address['area_id']; - $mmm['street_id'] = $user_address['street_id']; - }elseif ($user_address['auth_range'] == 5) { - $mmm['area_id'] = $user_address['area_id']; - $mmm['street_id'] = $user_address['street_id']; - $mmm['village_id'] = $user_address['village_id']; - $mmm['brigade_id'] = $user_address['brigade_id']; + $where[]= ['county','=',$user_address['area_id']]; + $where[] =['township','=', $user_address['street_id']]; } } } diff --git a/app/admin/controller/nk/Maturity.php b/app/admin/controller/nk/Maturity.php index 6df9cfd..7ce2a91 100644 --- a/app/admin/controller/nk/Maturity.php +++ b/app/admin/controller/nk/Maturity.php @@ -59,6 +59,18 @@ class Maturity extends BaseController ->where($where) ->count(); $list = Db::table('cms_agriculture_products') + ->withAttr('area_id',function ($value,$data){ + return Db::table('fa_geo_area')->where('area_code',$data['area_id'])->value('area_name'); + }) + ->withAttr('street_id',function ($value,$data){ + return Db::table('fa_geo_street')->where('street_code',$data['street_id'])->value('street_name'); + }) + ->withAttr('village_id',function ($value,$data){ + return Db::table('fa_geo_village')->where('village_id',$data['village_id'])->value('village_name'); + }) + ->withAttr('image',function ($value,$data){ + return Db::table('fa_szxc_planting_type')->where('id',$data['szxc_planting_type_id'])->value('image'); + }) ->withAttr('status',function ($value,$data){ if($value == 1){ return '正常'; diff --git a/app/admin/controller/nk/StreetCulture.php b/app/admin/controller/nk/StreetCulture.php index 4a09a18..9dcb63c 100644 --- a/app/admin/controller/nk/StreetCulture.php +++ b/app/admin/controller/nk/StreetCulture.php @@ -52,21 +52,15 @@ class StreetCulture extends BaseController $user_address = Db::table('fa_szxc_information_useraddress')->where($www)->find(); if ($user_address) { if ($user_address['auth_range'] == 1) { - $mmm['area_id'] = $user_address['area_id']; - $mmm['street_id'] = $user_address['street_id']; - $mmm['village_id'] = $user_address['village_id']; + $where[]= ['county','=',$user_address['area_id']]; + $where[] =['township','=', $user_address['street_id']]; + $where[] =['village','=', $user_address['village_id']]; } elseif ($user_address['auth_range'] == 2) { - $mmm['area_id'] = $user_address['area_id']; - $mmm['street_id'] = $user_address['street_id']; - }elseif ($user_address['auth_range'] == 5) { - $mmm['area_id'] = $user_address['area_id']; - $mmm['street_id'] = $user_address['street_id']; - $mmm['village_id'] = $user_address['village_id']; - $mmm['brigade_id'] = $user_address['brigade_id']; + $where[]= ['county','=',$user_address['area_id']]; + $where[] =['township','=', $user_address['street_id']]; } } } - $map[] = ['category_id','in',[307,308,309,310,311,312]]; $total = Db::table('fa_article') ->where($where) diff --git a/app/admin/view/index/main.html b/app/admin/view/index/main.html index 8db5333..01e60db 100644 --- a/app/admin/view/index/main.html +++ b/app/admin/view/index/main.html @@ -136,329 +136,9 @@ {block name="script"} - {/block} diff --git a/app/admin/view/nk/farmers/index.html b/app/admin/view/nk/farmers/index.html index 04928d0..f2986ca 100644 --- a/app/admin/view/nk/farmers/index.html +++ b/app/admin/view/nk/farmers/index.html @@ -23,12 +23,24 @@ {/block} diff --git a/app/admin/view/nk/maturity/index.html b/app/admin/view/nk/maturity/index.html index c72ee8d..7834f43 100644 --- a/app/admin/view/nk/maturity/index.html +++ b/app/admin/view/nk/maturity/index.html @@ -21,12 +21,24 @@ {/block} @@ -52,27 +64,35 @@ field: 'id', title: '编号', align: 'center', - width:80, + },{ + field: 'area_id', + title: '区县', + align: 'center', + },{ + field: 'street_id', + title: '乡镇', + align: 'center', + },{ + field: 'village_id', + title: '街道/村', + align: 'center', },{ field: 'title', title: '农作物名称', align: 'center', - width:150, },{ - field: 'content', - title: '内容', + field: 'image', + title: '图片', align: 'center', - width:150, + templet: '