部门搜索增加站点区分

application/index/controller/District.php

@@ -36,13 +36,13 @@ class District extends Basic
         $pageSize = empty($this->params['pageSize']) ? 10 : $this->params['pageSize'];
         $agents = new ADistrict();
 
-        $where = '';
+        $where = 'a.site_id='.$this->siteId;
         $join  = 0;
         $field = '';
 
         if ($this->params['search'] != NULL) {
             $field  = 'a.id,a.district_name,a.create_time,b.name,b.phone,a.site_id';
-            $where .= "a.status=0 AND (phone like '{$this->params['search']}%' or name like '{$this->params['search']}%')";
+            $where .= " AND a.status=0 AND (phone like '{$this->params['search']}%' or name like '{$this->params['search']}%')";
             $join = 1;
         }
 
@@ -109,6 +109,7 @@ class District extends Basic
         $pageNo   = empty($this->params['pageNo']) ? 1 : $this->params['pageNo'];
         $pageSize = empty($this->params['pageSize']) ? 10 : $this->params['pageSize'];
         $where['status'] = 0;
+        $where['site_id'] = $this->siteId;
         if ($this->params['district_name']) {
             $where['district_name'] = ['LIKE', $this->params['district_name']. '%'];
         }
@@ -143,6 +144,7 @@ class District extends Basic
         $field = 'id,district_name';
 
         $where['status'] = 0;
+        $where['site_id'] = $this->siteId;
         $data['data'] = $agents->getList($pageNo, $pageSize, 'id DESC', $field, $where);
 
         return $this->response($data['status'], $data['msg'], $data['data']);

application/index/extend/Basic.php

@@ -298,6 +298,10 @@ class Basic extends Controller
     public function getCity($agentId)
     {
         try {
+            if (empty($this->userId)) {
+                return ;    //没有登陆
+            }
+
             $redis_ = RedisExt::getRedis();
             if ($redis_) {
                 $this->city = $redis_->get("agent_city_" . $agentId);