up admin

app/adminapi/lists/auth/AdminLists.php

@@ -135,9 +135,9 @@ class AdminLists extends BaseAdminDataLists implements ListsExtendInterface, Lis
     {
         $field = [
             'id', 'name', 'account', 'create_time', 'disable', 'root',
-            'login_time', 'login_ip', 'multipoint_login', 'avatar'
+            'login_time', 'login_ip', 'multipoint_login', 'avatar',
+            'province', 'city', 'area_name'
         ];
-
         $adminLists = Admin::field($field)
             ->where($this->searchWhere)
             ->where($this->queryWhere())

app/adminapi/logic/auth/AdminLogic.php

@@ -61,6 +61,9 @@ class AdminLogic extends BaseLogic
                 'create_time' => time(),
                 'disable' => $params['disable'],
                 'multipoint_login' => $params['multipoint_login'],
+                'province' => $params['province']??0,
+                'city' => $params['city']??0,
+                'area_name' => $params['area_name']??'',
             ]);
 
             // 角色
@@ -97,7 +100,10 @@ class AdminLogic extends BaseLogic
                 'name' => $params['name'],
                 'account' => $params['account'],
                 'disable' => $params['disable'],
-                'multipoint_login' => $params['multipoint_login']
+                'multipoint_login' => $params['multipoint_login'],
+                'province' => $params['province']??0,
+                'city' => $params['city']??0,
+                'area_name' => $params['area_name']??'',
             ];
 
             // 头像
@@ -227,6 +233,7 @@ class AdminLogic extends BaseLogic
         $admin = Admin::field([
             'id', 'account', 'name', 'disable', 'root',
             'multipoint_login', 'avatar',
+            'province', 'city', 'area_name'
         ])->findOrEmpty($params['id'])->toArray();
 
         if ($action == 'detail') {
@@ -363,7 +370,7 @@ class AdminLogic extends BaseLogic
                 }
             }
 
-            //$rules = JobsRulesLogic::ruleSelfValue($adminId,$rules);
+            $rules = JobsRulesLogic::ruleSelfValue($adminId,$rules);
 
             foreach ($rules as $rule_id => $value) {
                 $rules[$jobs_rules[$rule_id]] = $value;

app/adminapi/logic/jobs_rules/JobsRulesLogic.php

@@ -132,15 +132,36 @@ class JobsRulesLogic extends BaseLogic
         switch ($params['id']) {
             case 1:
                 $result = TableDataLogic::provinces();
+                // 数组的开始位置添加一个数组
+                array_unshift($result, [
+                    "id" => 'self',
+                    "name" => "管理员所属",
+                    "value" => "self",
+                    "type_value" => "data_table_provinces",
+                ]);
                 break;
             case 2:
                 $result = TableDataLogic::citys($province_ids);
+                // 数组的开始位置添加一个数组
+                array_unshift($result, [
+                    "id" => 'self',
+                    "name" => "管理员所属",
+                    "value" => "self",
+                    "type_value" => "data_table_citys",
+                ]);
                 break;
             case 3:
                 $result = TableDataLogic::saleGroup();
                 break;
             case 4:
                 $result = TableDataLogic::admins();
+                // 数组的开始位置添加一个数组
+                array_unshift($result, [
+                    "id" => 'self',
+                    "name" => "管理员所属",
+                    "value" => "self",
+                    "type_value" => "data_table_admins",
+                ]);
                 break;
             case 5:
                 $result = TableDataLogic::propertyHead();