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

---
 app/api/controller/Userinfo.php |  3 +++
 app/api/controller/Village.php  | 16 ++++++++++++----
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/app/api/controller/Userinfo.php b/app/api/controller/Userinfo.php
index 6f87bbd..d98336a 100644
--- a/app/api/controller/Userinfo.php
+++ b/app/api/controller/Userinfo.php
@@ -98,6 +98,9 @@ class Userinfo extends BaseController
         if(!$post['idcard']  || !$post['area_id'] || !$post['street_id'] || !$post['village_id'] ||  !$post['name']){
             $this->apiError('缺少参数');
         }
+        if($post['phone'] == 'undefined'){
+            $this->apiError('手机号错误');
+        }
         $where['id'] = $this->request->uid;
         $post['user_id'] = $this->request->uid;
         $user            = Db::table('fa_user')->where($where)->field('id,nickname,group_id,mobile,avatar,username,createtime,score')->find();
diff --git a/app/api/controller/Village.php b/app/api/controller/Village.php
index f840968..21accd1 100644
--- a/app/api/controller/Village.php
+++ b/app/api/controller/Village.php
@@ -214,16 +214,16 @@ class Village extends BaseController
         if ($list) {
             //级别（1市级，2区县，3乡镇）
             if($list['level'] == 1){
-                $num1 = Db::table('fa_szxc_information_useraddress')->group('village_id')->count();
+                $num1 = Db::table('fa_szxc_village')->where('village_id','>',0)->where('status',1)->count();
                 $num2 = Db::table('fa_szxc_information_useraddress')->count();
                 $num3 = Db::table('fa_szxc_information_usermsg')->where('is_hz',1)->count();
             }elseif($list['level'] == 2){
-                $num1 = Db::table('fa_szxc_information_useraddress')->where('area_id',$code)->group('village_id')->count();
+                $num1 = Db::table('fa_szxc_village')->where('area_id',$code)->where('village_id','>',0)->where('status',1)->count();
                 $num2 = Db::table('fa_szxc_information_useraddress')->where('area_id',$code)->count();
                 $num3 = Db::table('fa_szxc_information_usermsg')->where('is_hz',1)->where('area_id',$code)->count();
             }
             elseif($list['level'] == 3){
-                $num1 = Db::table('fa_szxc_information_useraddress')->where('street_id',$code)->group('village_id')->count();
+                $num1 = Db::table('fa_szxc_village')->where('street_id',$code)->where('village_id','>',0)->where('status',1)->count();
                 $num2 = Db::table('fa_szxc_information_useraddress')->where('street_id',$code)->count();
                 $num3 = Db::table('fa_szxc_information_usermsg')->where('is_hz',1)->where('street_id',$code)->count();
             }else{
@@ -238,7 +238,15 @@ class Village extends BaseController
             ];
             $this->apiSuccess('获取成功', $list);
         } else {
-            $this->apiError('获取失败');
+            $num1 = Db::table('fa_szxc_village')->where('street_id',$code)->where('village_id','>',0)->where('status',1)->count();
+            $num2 = Db::table('fa_szxc_information_useraddress')->where('street_id',$code)->count();
+            $num3 = Db::table('fa_szxc_information_usermsg')->where('is_hz',1)->where('street_id',$code)->count();
+            $list['data'] = [
+                ['num'=>$num1,'text'=>'村庄数'],
+                ['num'=>$num2,'text'=>'村民数'],
+                ['num'=>$num3,'text'=>'户数'],
+            ];
+            $this->apiSuccess('获取成功', $list);
         }
     }