mkm/nk-lihaink-cn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

接口修改2

Browse Source
This commit is contained in:
彭桃 2023-02-10 13:48:26 +08:00
parent 759ab242f4
commit bb9709be3f
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/admin/controller/nk/Analysis.php
View File

@ -39,30 +39,29 @@ class Analysis extends BaseController
$find = Db::table('fa_szxc_information_useraddress')->where('admin_id', $this->adminInfo['id'])->find();
if ($find) {
if ($find['auth_range'] == 1) {
$mmm['b.village_id'] = $www['d.village_id'] = $where[] = $find['village_id'];
$mmm['b.village_id'] = $www['d.village_id'] = $where['village_id'] = $find['village_id'];
} elseif ($find['auth_range'] == 2) {
$mmm['b.street_id'] = $www['d.street_id'] = $where[] = $find['street_id'];
$mmm['b.street_id'] = $www['d.street_id'] = $where['street_id'] = $find['street_id'];
} elseif ($find['auth_range'] == 3) {
$mmm['b.area_id'] = $www['d.area_id'] = $where[] = $find['area_id'];
$mmm['b.area_id'] = $www['d.area_id'] = $where['area_id'] = $find['area_id'];
}
}
}
if ($post) {
if (isset($post['area_id']) && !empty($post['area_id'])) {
$mmm['b.area_id'] = $www['d.area_id'] = $where[] = $post['area_id'];
$mmm['b.area_id'] = $www['d.area_id'] = $where['area_id'] = $post['area_id'];
}
if (isset($post['street_id']) && !empty($post['street_id'])) {
$mmm['b.street_id'] = $www['d.street_id'] = $where[] = $post['street_id'];
$mmm['b.street_id'] = $www['d.street_id'] = $where['street_id'] = $post['street_id'];
}
if (isset($post['village_id']) && !empty($post['village_id'])) {
$mmm['b.village_id'] = $www['d.village_id'] = $where[] = $post['village_id'];
$mmm['b.village_id'] = $www['d.village_id'] = $where['village_id'] = $post['village_id'];
}
// if (isset($post['brigade_id']) && !empty($post['brigade_id'])) {
// $mmm['b.brigade_id'] = $www['d.brigade_id'] = $post['brigade_id'];
// }
}
$map[] = ['a.status','=',1];
$map[] = ['a.is_del','=',0];
//企业农产品销量
@ -93,11 +92,11 @@ class Analysis extends BaseController
if ($user_address) {
if ($user_address['auth_range'] == 1) {
$mmm['b.village_id'] = $www['d.village_id'] = $where[] = $user_address['village_id'];
$mmm['b.village_id'] = $www['d.village_id'] = $where['village_id'] = $user_address['village_id'];
} elseif ($user_address['auth_range'] == 2) {
$mmm['b.street_id'] = $www['d.street_id'] = $where[] = $user_address['street_id'];
$mmm['b.street_id'] = $www['d.street_id'] = $where['street_id'] = $user_address['street_id'];
} elseif ($user_address['auth_range'] == 3) {
$mmm['b.area_id'] = $www['d.area_id'] = $where[] = $user_address['area_id'];
$mmm['b.area_id'] = $www['d.area_id'] = $where['area_id'] = $user_address['area_id'];
}
if ($user_address['auth_range'] <=3 &&$user_address['auth_range'] >=1 ) {
@ -125,7 +124,6 @@ class Analysis extends BaseController
View::assign('row', $user_address);
$is_admin = 1;
}
$map[] = ['a.status','=',1];
$map[] = ['a.is_del','=',0];
//企业农产品销量

6
app/api/controller/Census.php
View File

@ -32,13 +32,13 @@ class Census extends BaseController
// }
if ($post) {
if (isset($post['area_id']) && !empty($post['area_id'])) {
$mmm['b.area_id'] = $www['d.area_id'] = $where[] = $post['area_id'];
$mmm['b.area_id'] = $www['d.area_id'] = $where['area_id'] = $post['area_id'];
}
if (isset($post['street_id']) && !empty($post['street_id'])) {
$mmm['b.street_id'] = $www['d.street_id'] = $where[] = $post['street_id'];
$mmm['b.street_id'] = $www['d.street_id'] = $where['street_id'] = $post['street_id'];
}
if (isset($post['village_id']) && !empty($post['village_id'])) {
$mmm['b.village_id'] = $www['d.village_id'] = $where[] = $post['village_id'];
$mmm['b.village_id'] = $www['d.village_id'] = $where['village_id'] = $post['village_id'];
}
}