1

# Conflicts: # application/index/controller/BusinessDistrict.php

1
182ee770 · hujun · c5f380a9 · 182ee770
Commit 182ee770 authored Nov 14, 2018 by hujun
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 3 deletions

BusinessDistrict.php application/index/controller/BusinessDistrict.php +1 -3

No files found.
--- a/application/index/controller/BusinessDistrict.php
+++ b/application/index/controller/BusinessDistrict.php
@@ -159,9 +159,7 @@ class BusinessDistrict extends Basic
            $where['province'] = $this->params['province'];
        }

-        if (empty($this->params['city']) && $this->userId != 1) {
-            $where['city'] = $this->city;
-        } else {
+        if (!empty($this->params['city'])) {
            $where['city'] = $this->params['city'];
        }