From 7d6c804db15eee45ca506602595e01f2d89a4122 Mon Sep 17 00:00:00 2001
From: PPPSCN <35696959@qq.com>
Date: Wed, 28 Mar 2018 21:42:10 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E9=BB=98=E8=AE=A4=E5=BC=80=E5=90=AF?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=EF=BC=88import=EF=BC=89=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E2=80=94=E2=80=94=E6=B3=A8=E9=87=8Abug=202=E3=80=81=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=20ajax/area=E5=85=BC=E5=AE=B9=E4=B8=80=E9=94=AECRUD?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E7=9A=84row=E6=95=B0=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/command/Crud/stubs/controller.stub |  6 +++++-
 application/admin/controller/Ajax.php                | 12 ++++++++++--
 application/admin/lang/zh-cn.php                     |  1 +
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/application/admin/command/Crud/stubs/controller.stub b/application/admin/command/Crud/stubs/controller.stub
index 9b7af80d..d4e70604 100644
--- a/application/admin/command/Crud/stubs/controller.stub
+++ b/application/admin/command/Crud/stubs/controller.stub
@@ -23,12 +23,16 @@ class {%controllerName%} extends Backend
         $this->model = model('{%modelName%}');
 {%controllerAssignList%}
     }
-    
+
     /**
      * 默认生成的控制器所继承的父类中有index/add/edit/del/multi五个基础方法、destroy/restore/recyclebin三个回收站方法
      * 因此在当前控制器中可不用编写增删改查的代码,除非需要自己控制这部分逻辑
      * 需要将application/admin/library/traits/Backend.php中对应的方法复制到当前控制器,然后进行修改
      */
+
+    /**
+     * 导入
+     */
     public function import()
     {
         return parent::import();
diff --git a/application/admin/controller/Ajax.php b/application/admin/controller/Ajax.php
index fa67be73..75d5c745 100644
--- a/application/admin/controller/Ajax.php
+++ b/application/admin/controller/Ajax.php
@@ -265,8 +265,16 @@ class Ajax extends Backend
     public function area()
     {
         $params = $this->request->get("row/a");
-        $province = !empty($params['province']) ? $params['province'] : $this->request->get('province');
-        $city = !empty($params['city']) ? $params['city'] : $this->request->get('city');
+        if (!empty($params))
+        {
+            $province = isset($params['province']) ? $params['province'] : '';
+            $city = isset($params['city']) ? $params['city'] : null;
+        }
+        else
+        {
+            $province = $this->request->get('province');
+            $city = $this->request->get('city');
+        }
         $where = ['pid' => 0, 'level' => 1];
         $provincelist = null;
         if ($province !== '')
diff --git a/application/admin/lang/zh-cn.php b/application/admin/lang/zh-cn.php
index 483fd47f..1174f021 100755
--- a/application/admin/lang/zh-cn.php
+++ b/application/admin/lang/zh-cn.php
@@ -169,4 +169,5 @@ return [
     'Admin log tips'                                        => '管理员可以查看自己所拥有的权限的管理员日志',
     'Group tips'                                            => '角色组可以有多个,角色有上下级层级关系,如果子角色有角色组和管理员的权限则可以派生属于自己组别的下级角色组或管理员',
     'Rule tips'                                             => '规则通常对应一个控制器的方法,同时左侧的菜单栏数据也从规则中体现,通常建议通过命令行进行生成规则节点',
+    'Set to recommend'                                      => '设为推荐',
 ];