管理员的数据权限值

app/adminapi/logic/auth/AdminLogic.php

@@ -351,10 +351,6 @@ class AdminLogic extends BaseLogic
             $list = Jobs::whereIn('id', $jobsIds)->where('status', YesNoEnum::YES)->select()->toArray();
             foreach ($list as $item) {
                 //$item['rules_data']
-                /*[{"block_key":"1","rule_id":"1","value_lists":[],"rule_value":["self","37"]},
-                    {"block_key":"2","rule_id":"2","value_lists":[],"rule_value":["self","124"]},
-                    {"block_key":"3","rule_id":"4","value_lists":[],"rule_value":["self","4"]},
-                    {"block_key":"4","rule_id":"5","value_lists":[],"rule_value":["2","6","5"]}]*/
                 $rules_data = array_column($item['rules_data'], 'rule_value', 'rule_id');
                 foreach ($rules_data as $rule_id => $rule_value) {
                     if(isset($rules[$rule_id])){

app/adminapi/logic/jobs_rules/JobsRulesLogic.php

@@ -185,7 +185,11 @@ class JobsRulesLogic extends BaseLogic
      */
     public static function ruleSelfValue($adminId,$rules)
     {
-        $admin = Admin::where('admin_id', $adminId)->where('root','=',0)->find()->toArray();
+        $admin = Admin::where('admin_id', $adminId)->where('root','=',0)->findOrEmpty();
+        if($admin->isEmpty()){
+            return [];
+        }
+        $admin = $admin->toArray();
         function replace_value($rule,$replace_value) {
             array_walk($rule,function (&$value,$key) use($replace_value) {
                 if ($value == 'self'){