[智价云] 角色省份信息补充

app/Http/Controllers/Manager/Process/LowPriceGoods.php

@@ -17,7 +17,6 @@ use Illuminate\Support\Facades\DB;
 use App\Models\Manager\Citys as CitysModel;
 use App\Servers\Aliyun\Oss;
 use App\Jobs\Manager\Other\ExportLowPriceGoodsJobs;
-use App\Models\Manager\Other\DownloadTask as DownloadTaskModel;
 use Illuminate\Support\Facades\Cache;
 
 /**
@@ -183,7 +182,13 @@ class LowPriceGoods extends Controller
             $shipment_city_ids = explode(',', $shipment_city_ids);
             $LowPriceGoodsModel = $LowPriceGoodsModel->whereIn('shipment_city_id', $shipment_city_ids);
         }
-
+        $personnel_roles_info = $EmployeeModel->leftjoin('personnel_roles', 'personnel_roles.id', '=', 'personnel_employee.role_id')
+            ->where('personnel_employee.id', $user_id)->select(['personnel_employee.id', 'personnel_roles.identity'])
+            ->first();
+        //角色身份1=普通2=管理员
+        if(!empty($personnel_roles_info) && $personnel_roles_info->identity == 1){ 
+            $is_admin = 1;
+        }
         if ($is_admin != 1 && $company_id != 0) {
             $result = $LowPriceGoodsModel->where(function ($q) use ($user_id) {
                 $q->where('first_responsible_person', 'like', "%,$user_id,%")

app/Http/Controllers/Manager/Process/ViolationProduct.php

@@ -182,7 +182,13 @@ class ViolationProduct extends Controller
             $shipment_city_ids = explode(',', $shipment_city_ids);
             $ViolationProductModel = $ViolationProductModel->whereIn('shipment_city_id', $shipment_city_ids);
         }
-
+        $personnel_roles_info = $EmployeeModel->leftjoin('personnel_roles', 'personnel_roles.id', '=', 'personnel_employee.role_id')
+            ->where('personnel_employee.id', $user_id)->select(['personnel_employee.id', 'personnel_roles.identity'])
+            ->first();
+        //角色身份1=普通2=管理员
+        if (!empty($personnel_roles_info) && $personnel_roles_info->identity == 1) {
+            $is_admin = 1;
+        }
         if ($is_admin != 1 && $company_id != 0) {
             $result = $ViolationProductModel->where(function ($q) use ($user_id) {
                 $q->where('first_responsible_person', 'like', "%,$user_id,%")

app/Http/Controllers/Manager/Process/ViolationStore.php

@@ -143,6 +143,13 @@ class ViolationStore extends Controller
             $city_ids = explode(',', $city_ids);
             $ViolationStoreModel = $ViolationStoreModel->whereIn('city_id', $city_ids);
         }
+        $personnel_roles_info = $EmployeeModel->leftjoin('personnel_roles', 'personnel_roles.id', '=', 'personnel_employee.role_id')
+            ->where('personnel_employee.id', $user_id)->select(['personnel_employee.id', 'personnel_roles.identity'])
+            ->first();
+        //角色身份1=普通2=管理员
+        if (!empty($personnel_roles_info) && $personnel_roles_info->identity == 1) {
+            $is_admin = 1;
+        }
         // 查询数据
         if ($is_admin != 1 && $company_id != 0) {
             $result = $ViolationStoreModel->where(function ($q) use ($user_id) {

app/Http/Requests/Manager/Personnel/Roles.php

@@ -35,6 +35,7 @@ class Roles extends BaseRequest
             'role_id'           => 'required|integer|gt:0',
             'password'          => 'required',
             'open_notice'       => 'required|integer|in:0,1',
+            'identity'          => 'required|integer|in:1,2',
         ];
     }
 
@@ -43,8 +44,8 @@ class Roles extends BaseRequest
     protected   $scenes         = [
         'detail'             => ['id'],
         'list'               => ['page', 'limit'],
-        'add'                      => ['name'],
-        'edit'                  => ['id','name'],
+        'add'                      => ['name','identity'],
+        'edit'                  => ['id','name','identity'],
         'set_status'              => ['id', 'status'],
         'delete'                  => ['id'],
     ];
@@ -73,6 +74,9 @@ class Roles extends BaseRequest
             'sort.required'         => '排序未知',
             'sort.integer'          => '排序格式错误',
             'sort.min'              => '排序格式错误',
+            'identity.required'       => '角色身份未知',
+            'identity.integer'        => '角色身份格式错误',
+            'identity.in'             => '角色身份格式错误',
         ];
     }
 }

app/Models/Manager/Personnel/Roles.php

@@ -36,6 +36,7 @@ class Roles extends Model
         $insert_data = [
             'name' => $data['name'],
             'company_id' => $data['company_id'],
+            'identity' => $data['identity'],
             'insert_time' => time(),
         ];
         $Roles_id = $this->insertGetId($insert_data);
@@ -80,6 +81,7 @@ class Roles extends Model
     public function editRoles_content($Roles, $data)
     {
         $Roles->name = $data['name'];
+        $Roles->identity = $data['identity'];
         $Roles->update_time = time();
         $Roles->save();
         return true;

app/Models/Manager/Personnel/RolesAuthRule.php

@@ -66,6 +66,7 @@ class RolesAuthRule extends Model
             if (!empty($add_menu_ids)) {
                 $add_data = [];
                 foreach ($add_menu_ids as $menu_id) {
+                    if(empty($menu_id)) continue;
                     $add_data[] = [
                         'url' => isset($urls_data[$menu_id]['url']) ? $urls_data[$menu_id]['url'] : '',
                         'role_id' => $data['role_id'],
@@ -83,7 +84,6 @@ class RolesAuthRule extends Model
             // 成功处理...
         } catch (\Exception $e) {
             DB::rollBack();
-            print_r($e->getMessage());
             exit;
             // 错误处理...
             return false;