新增权限控制

app/Admin/Service/UserService.php

@@ -58,10 +58,11 @@ class UserService
 
 
     public static function userListTool(Grid $grid)
     public static function userListTool(Grid $grid)
     {
     {
-        $grid->tools([
-            new UserTransferAction(),
-            new UserAssignAction(),
-        ]);
+        $action = [new UserTransferAction()];
+        if (getAdminUserId() == 1000 || checkPerm(User::SEM_USER_VIEW_SUB) || checkPerm(User::SEM_USER_VIEW_ALL)) {
+            $action[] = new UserAssignAction();
+        }
+        $grid->tools($action);
     }
     }
 
 
     public static function userListActions(Grid $grid)
     public static function userListActions(Grid $grid)
@@ -187,7 +188,7 @@ class UserService
             ];
             ];
             User::updateByIdArr($userIds, $update);
             User::updateByIdArr($userIds, $update);
             InquiryService::batchUpdateSalesId($saleId, $userIds);
             InquiryService::batchUpdateSalesId($saleId, $userIds);
-            OrderService::changeOrderSales($userIds,$saleId,$saleInfo["name"]);
+            OrderService::changeOrderSales($userIds, $saleId, $saleInfo["name"]);
 
 
             DB::commit();
             DB::commit();
         } catch (\Throwable $throwable) {
         } catch (\Throwable $throwable) {

app/Models/BaseModel.php

@@ -9,12 +9,12 @@ class BaseModel extends Model
 {    /*
 {    /*
      * 权限
      * 权限
      */
      */
-    public function scopeRule($query, $viewList,$adminUser="sale_id")
+    public function scopeRule($query, $viewList, $adminUser = "sale_id")
     {
     {
         $nowSaleId = getAdminUserId();
         $nowSaleId = getAdminUserId();
-//        if ($nowSaleId == 1000) {
-//            return $query;
-//        }
+        if ($nowSaleId == 1000) {
+            return $query;
+        }
         //查看所有
         //查看所有
         if (checkPerm($viewList[0])) {
         if (checkPerm($viewList[0])) {
             return $query;
             return $query;

app/Models/Cms/CmsUser.php

@@ -16,6 +16,11 @@ class CmsUser extends Model
         return ($res) ? $res->toArray() : [];
         return ($res) ? $res->toArray() : [];
     }
     }
 
 
+    public static function getUserList()
+    {
+        return CmsUser::where([])->rule(\App\Models\User::$ruleViewList, 'userId')->pluck('name', 'userId')->toArray();
+    }
+
     //根据部门id获取列表
     //根据部门id获取列表
     public static function getUserListByDepartmentId($departmentIds)
     public static function getUserListByDepartmentId($departmentIds)
     {
     {
@@ -25,7 +30,7 @@ class CmsUser extends Model
 
 
 
 
     // 根据部门ID获取用户
     // 根据部门ID获取用户
-    public static function getUserIdsByDepartmentIds($department_ids = [], $field=[], $status='')
+    public static function getUserIdsByDepartmentIds($department_ids = [], $field = [], $status = '')
     {
     {
         $res = self::whereIn('department_id', $department_ids);
         $res = self::whereIn('department_id', $department_ids);