From 72d4462e86b133fff0addcb6ddff9c34d3184c95 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Fri, 10 Feb 2023 17:39:45 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B03?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/controller/nk/Community.php | 4 +- app/admin/controller/nk/User.php | 17 +- app/admin/view/index/main.html | 465 -------------------------- app/admin/view/nk/user/auths.html | 1 + 4 files changed, 7 insertions(+), 480 deletions(-) delete mode 100644 app/admin/view/index/main.html diff --git a/app/admin/controller/nk/Community.php b/app/admin/controller/nk/Community.php index 6f4b190..07c8f17 100644 --- a/app/admin/controller/nk/Community.php +++ b/app/admin/controller/nk/Community.php @@ -8,7 +8,7 @@ use think\facade\View; /** - * 文章投诉 + * 村民互动(逛逛) * * @icon fa fa-circle-o */ @@ -38,7 +38,6 @@ class Community extends BaseController if (request()->isAjax()) { $params= get_params(); $where['status']=1; - $where = []; if (isset($params['keywords'])){ // $where[]=['title','like','%'.$params['keywords'].'%']; } @@ -57,7 +56,6 @@ class Community extends BaseController $where['village_id'] = ''; } } - $total = Db::connect('shop')->name('community_address') ->where($where) ->count(); diff --git a/app/admin/controller/nk/User.php b/app/admin/controller/nk/User.php index 2549c64..07b9c6c 100644 --- a/app/admin/controller/nk/User.php +++ b/app/admin/controller/nk/User.php @@ -44,16 +44,14 @@ class User extends BaseController $map[] = ['m.phone', 'LIKE', '%' . $post['phone'] . '%']; } - //权限组信息 if ($this->adminInfo['group_access'] != 1) { $find = Db::table('fa_szxc_information_useraddress')->where('admin_id', $this->adminInfo['id'])->find(); if ($find) { if ($find['auth_range'] == 1) { - $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'] == 3) { + } elseif ($find['auth_range'] == 2) { $mmm['area_id'] = $find['area_id']; } } @@ -72,14 +70,11 @@ class User extends BaseController $mmm['brigade_id'] = $post['brigade_id']; } } - //权限组信息 $total = Db::table('fa_szxc_information_usermsg') ->alias('m') ->where($mmm) ->where($map) - ->join(['fa_user' => 'u'], 'm.user_id=u.id') - ->join(['fa_user_group' => 'g'], 'g.id=u.group_id') ->count(); $list = Db::table('fa_szxc_information_usermsg') ->alias('m') @@ -743,14 +738,12 @@ class User extends BaseController $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']; + $mmm['area_id'] = $find['area_id']; + $mmm['street_id'] = $find['street_id']; } elseif ($find['auth_range'] == 2) { - $where['street_id'] = $find['street_id']; - } elseif ($find['auth_range'] == 3) { - $where['area_id'] = $find['area_id']; + $mmm['area_id'] = $find['area_id']; } } - if (!empty($post['village_id'])) { $where['village_id'] = $post['village_id']; } diff --git a/app/admin/view/index/main.html b/app/admin/view/index/main.html deleted file mode 100644 index 8db5333..0000000 --- a/app/admin/view/index/main.html +++ /dev/null @@ -1,465 +0,0 @@ -{extend name="common/base"/} -{block name="style"} - -{/block} - -{block name="body"} -
-
-
-
-
-
- - - - - - - - - - - - - - - - -
-
总会员数
-
{$totaluser}
- 		-
老人人数
-
{$old_num}
- 		-
儿童人数
-
{$children_num}
- 		-
未婚男
-
{$unmarried_man_num}
- 		-
未婚女
-
{$unmarried_woman_num}
-
-
残疾人数
-
{$whether_disabled_num}
- 		-
参保人数
-
{$insurance_type_num}
- 		-
少数名族人数
-
{$nation_s_num}
- 		-
汉族人数
-
{$nation_h_num}
- 		-
工作人员数
-
{$work_num}
-
-
- -
- - - - - - - - - - - - - - -
-
土地总面积
-
{$land_area_num}
- 		-
荒地
-
{$waste_land_area}
- 		-
农田水利
-
{$sum_218}
- 		-
坑塘
-
{$sum_217}
- 		-
养殖
-
{$sum_216}
-
-
牧草地
-
{$sum_215}
- 		-
林地
-
{$sum_214}
- 		-
耕地
-
{$sum_70}
- 		-
园地
-
{$sum_69}
-
-
-
-
-
- -
-
-
-
-
-{/block} - - - -{block name="script"} - - -{/block} - \ No newline at end of file diff --git a/app/admin/view/nk/user/auths.html b/app/admin/view/nk/user/auths.html index 5cf1ef7..567cc53 100644 --- a/app/admin/view/nk/user/auths.html +++ b/app/admin/view/nk/user/auths.html @@ -42,6 +42,7 @@ {volist name='street' id='vo'} {if $address.area_id==$vo.code} + {/if} {/volist} {/if}