[智价云] 权限ID字段统一

app/Models/Manager/Personnel/Roles.php

@@ -55,8 +55,8 @@ class Roles extends Model
         $RolesAuthRuleModel = new RolesAuthRuleModel();
         DB::beginTransaction();
         try {
-            $roles_id=$this->addRoles_content($data);
-            $RolesAuthRuleModel->addRolesAuthRule(['roles_id'=> $roles_id,'menu_ids'=>$data['menu_ids']]);
+            $role_id=$this->addRoles_content($data);
+            $RolesAuthRuleModel->addRolesAuthRule(['role_id'=> $role_id,'menu_ids'=>$data['menu_ids']]);
             DB::commit();
             return true;
             // 成功处理...
@@ -100,7 +100,7 @@ class Roles extends Model
         DB::beginTransaction();
         try {
             $this->editRoles_content($Roles, $data);
-            $RolesAuthRuleModel->addRolesAuthRule(['roles_id'=> $Roles->id,'menu_ids'=>$data['menu_ids']]);
+            $RolesAuthRuleModel->addRolesAuthRule(['role_id'=> $Roles->id,'menu_ids'=>$data['menu_ids']]);
             DB::commit();
             return true;
             // 成功处理...

app/Models/Manager/Personnel/RolesAuthRule.php

@@ -34,7 +34,7 @@ class RolesAuthRule extends Model
     {
         $insert_data = [
             'url' => $data['url'],
-            'roles_id' => $data['roles_id'],
+            'role_id' => $data['role_id'],
             'menu_id' => $data['menu_id'],
             'insert_time' => time(),
         ];
@@ -56,7 +56,7 @@ class RolesAuthRule extends Model
         $MenuModel = new MenuModel();
         $menu_ids = explode(',', $data['menu_ids']);
         $urls_data = $MenuModel->whereIn('id', $menu_ids)->select(['id','url'])->get()->keyBy('id')->toArray();
-        $menu_id_log = $this->where(['roles_id' => $data['roles_id']])->select(['menu_id'])->get()->toArray();
+        $menu_id_log = $this->where(['role_id' => $data['role_id']])->select(['menu_id'])->get()->toArray();
         DB::beginTransaction();
         try {
             //差异新增或者删除
@@ -67,7 +67,7 @@ class RolesAuthRule extends Model
                 foreach ($add_menu_ids as $menu_id) {
                     $add_data[] = [
                         'url' => isset($urls_data[$menu_id]['url']) ? $urls_data[$menu_id]['url'] : '',
-                        'roles_id' => $data['roles_id'],
+                        'role_id' => $data['role_id'],
                         'menu_id' => $menu_id,
                         'insert_time' => time(),
                     ];
@@ -75,7 +75,7 @@ class RolesAuthRule extends Model
                 $this->insert($add_data);
             }
             if (!empty($del_menu_ids)) {
-                $this->where(['roles_id' => $data['roles_id']])->whereIn('menu_id', $del_menu_ids)->delete();
+                $this->where(['role_id' => $data['role_id']])->whereIn('menu_id', $del_menu_ids)->delete();
             }
             DB::commit();
             return true;
@@ -100,7 +100,7 @@ class RolesAuthRule extends Model
     public function editRolesAuthRule_content($RolesAuthRule, $data)
     {
         $RolesAuthRule->url = $data['url'];
-        $RolesAuthRule->roles_id = $data['roles_id'];
+        $RolesAuthRule->role_id = $data['role_id'];
         $RolesAuthRule->menu_id = $data['menu_id'];
         $RolesAuthRule->update_time = time();
         $RolesAuthRule->save();