gx

@@ -31,7 +31,6 @@ class BlogLabelController extends BaseController
     public function add(BlogLabelRequest $request,BlogLabelLogic $blogLabelLogic){
     public function add(BlogLabelRequest $request,BlogLabelLogic $blogLabelLogic){
         $request->validated();
         $request->validated();
         $blogLabelLogic->add_blog_label();
         $blogLabelLogic->add_blog_label();
-        //TODO::写入日志
         $this->response('success');
         $this->response('success');
     }
     }
 
 
@@ -47,7 +46,6 @@ class BlogLabelController extends BaseController
             'id.required' => 'ID不能为空'
             'id.required' => 'ID不能为空'
         ]);
         ]);
         $blogLabelLogic->edit_blog_label();
         $blogLabelLogic->edit_blog_label();
-        //TODO::写入日志
         $this->response('success');
         $this->response('success');
     }
     }
 
 
@@ -63,7 +61,6 @@ class BlogLabelController extends BaseController
             'id.required' => 'ID不能为空',
             'id.required' => 'ID不能为空',
         ]);
         ]);
         $blogLabelLogic->status_blog_label();
         $blogLabelLogic->status_blog_label();
-        //TODO::写入日志
         $this->response('success');
         $this->response('success');
     }
     }
 
 

@@ -3,21 +3,16 @@
 namespace App\Http\Controllers\Bside;
 namespace App\Http\Controllers\Bside;
 
 
 use App\Enums\Common\Code;
 use App\Enums\Common\Code;
-use App\Helper\Common;
-use App\Helper\FormGlobalsoApi;
 use App\Http\Logic\Bside\User\UserLogic;
 use App\Http\Logic\Bside\User\UserLogic;
 use App\Http\Logic\Bside\User\UserLoginLogic;
 use App\Http\Logic\Bside\User\UserLoginLogic;
-use App\Models\Project\DeployBuild;
 use App\Models\Project\Project;
 use App\Models\Project\Project;
 use App\Models\Project\Project as ProjectModel;
 use App\Models\Project\Project as ProjectModel;
 use App\Models\SmsLog;
 use App\Models\SmsLog;
 use App\Models\User\ProjectMenu as ProjectMenuModel;
 use App\Models\User\ProjectMenu as ProjectMenuModel;
 use App\Models\User\ProjectRole as ProjectRoleModel;
 use App\Models\User\ProjectRole as ProjectRoleModel;
 use App\Models\User\User as UserModel;
 use App\Models\User\User as UserModel;
-use Carbon\Carbon;
 use Illuminate\Http\Request;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Cache;
-use Illuminate\Support\Facades\DB;
 use Mrgoon\AliSms\AliSms;
 use Mrgoon\AliSms\AliSms;
 
 
 /***
 /***

@@ -16,9 +16,33 @@ class DeptUserController extends BaseController
      */
      */
     public function lists(ViewDeptUser $viewDeptUser){
     public function lists(ViewDeptUser $viewDeptUser){
         $this->map['project_id'] = $this->user['project_id'];
         $this->map['project_id'] = $this->user['project_id'];
-        $lists = $viewDeptUser->lists($this->map,$this->page,$this->row,'user_id');
-        $this->response('success',Code::SUCCESS,$lists);
+//        $lists = $viewDeptUser->lists($this->map,$this->page,$this->row,'user_id');
+        $result = DB::table('gl_project_user')->where($this->map)
+            ->select(
+                'gl_project_dept_user.dept_id AS dept_id',
+                'gl_project_user.name AS name',
+                'gl_project_user.project_id AS project_id',
+                'gl_project_user.mobile AS mobile',
+                'gl_project_user.email AS email',
+                'gl_project_user.status AS status',
+                'gl_project_user.role_id AS role_id',
+                'gl_project_user.operator_id AS operator_id',
+                'gl_project_dept_user.is_admin AS is_admin',
+                'gl_project_dept.title AS title',
+                'gl_project_dept.pid AS pid',
+                'gl_project_dept.remark AS remark',
+                'gl_project_user.id AS user_id',
+                'gl_project_dept_user.id AS id',
+                'gl_project_role.name AS role_name'
+            )
+            ->leftJoin('gl_project_dept_user', 'gl_project_user.id', '=', 'gl_project_dept_user.user_id')
+            ->leftJoin('gl_project_dept', 'gl_project_dept_user.dept_id', '=', 'gl_project_dept.id')
+            ->join('gl_project_role', 'gl_project_user.role_id', '=', 'gl_project_role.id')
+            ->orderBy('id','desc')
+            ->paginate($this->row, ['*'], 'page', $this->page);
+        $this->response('success',Code::SUCCESS,$result);
     }
     }
+
     /**
     /**
      * @param ViewDeptUser $viewDeptUser
      * @param ViewDeptUser $viewDeptUser
      * @name   :（详情）info
      * @name   :（详情）info