From bb9709be3fa3c05aeafc246c63375728e2bc23cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BD=AD=E6=A1=83?= <1098598843@qq.com>
Date: Fri, 10 Feb 2023 13:48:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/controller/nk/Analysis.php | 20 +++++++++-----------
 app/api/controller/Census.php        |  6 +++---
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/app/admin/controller/nk/Analysis.php b/app/admin/controller/nk/Analysis.php
index 3de5f7c..90f0068 100644
--- a/app/admin/controller/nk/Analysis.php
+++ b/app/admin/controller/nk/Analysis.php
@@ -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];
         //企业农产品销量
diff --git a/app/api/controller/Census.php b/app/api/controller/Census.php
index 14c1202..af71cd6 100644
--- a/app/api/controller/Census.php
+++ b/app/api/controller/Census.php
@@ -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'];
             }
         }