tijiu

app/Http/Controllers/Api/EmployeeController.php

@@ -4,21 +4,12 @@ namespace App\Http\Controllers\Api;
 
 
 use App\Service\EmployeeService;
-use App\Service\SysMenuService;
 use Illuminate\Http\Request;
 
-
 class EmployeeController extends BaseController
 {
-
-
-
-
-
     public function employeeEdit(Request $request)
     {
-
-
         $service = new EmployeeService();
         $user = $request->userData->toArray();
         list($status,$data) = $service->employeeEdit($request->all(),$user);
@@ -28,14 +19,10 @@ class EmployeeController extends BaseController
         }else{
             return $this->json_return(201,$data);
         }
-
     }
-
-
+    
     public function employeeAdd(Request $request)
     {
-
-
         $service = new EmployeeService();
         $user = $request->userData->toArray();
         list($status,$data) = $service->employeeAdd($request->all(),$user);
@@ -45,16 +32,12 @@ class EmployeeController extends BaseController
         }else{
             return $this->json_return(201,$data);
         }
-
     }
-
-
+    
     public function employeeDel(Request $request)
     {
-
-
         $service = new EmployeeService();
-        $user = $request->get('auth');
+        $user = $request->userData->toArray();
         list($status,$data) = $service->employeeDel($request->all());
 
         if($status){
@@ -62,16 +45,12 @@ class EmployeeController extends BaseController
         }else{
             return $this->json_return(201,$data);
         }
-
     }
 
-
     public function employeeList(Request $request)
     {
-
-
         $service = new EmployeeService();
-        $user = $request->get('auth');
+        $user = $request->userData->toArray();
         list($status,$data) = $service->employeeList($request->all());
 
         if($status){
@@ -79,17 +58,12 @@ class EmployeeController extends BaseController
         }else{
             return $this->json_return(201,$data);
         }
-
     }
 
-
-
     public function roleEdit(Request $request)
     {
-
-
         $service = new EmployeeService();
-        $user = $request->get('auth');
+        $user = $request->userData->toArray();
         list($status,$data) = $service->roleEdit($request->all());
 
         if($status){
@@ -97,17 +71,13 @@ class EmployeeController extends BaseController
         }else{
             return $this->json_return(201,$data);
         }
-
     }
 
-
     public function roleAdd(Request $request)
     {
-
-
         $service = new EmployeeService();
-        $user = $request->get('auth');
-        list($status,$data) = $service->roleAdd($request->all(),$request->all());
+        $user = $request->userData->toArray();
+        list($status,$data) = $service->roleAdd($request->all(),$user);
 
         if($status){
             return $this->json_return(200,'',$data);
@@ -117,13 +87,10 @@ class EmployeeController extends BaseController
 
     }
 
-
     public function roleDel(Request $request)
     {
-
-
         $service = new EmployeeService();
-        $user = $request->get('auth');
+        $user = $request->userData->toArray();
         list($status,$data) = $service->roleDel($request->all());
 
         if($status){
@@ -134,13 +101,10 @@ class EmployeeController extends BaseController
 
     }
 
-
     public function roleList(Request $request)
     {
-
-
         $service = new EmployeeService();
-        $user = $request->get('auth');
+        $user = $request->userData->toArray();
         list($status,$data) = $service->roleList($request->all());
 
         if($status){
@@ -148,17 +112,12 @@ class EmployeeController extends BaseController
         }else{
             return $this->json_return(201,$data);
         }
-
     }
 
-
-
     public function departEdit(Request $request)
     {
-
-
         $service = new EmployeeService();
-        $user = $request->get('auth');
+        $user = $request->userData->toArray();
         list($status,$data) = $service->departEdit($request->all());
 
         if($status){
@@ -166,17 +125,13 @@ class EmployeeController extends BaseController
         }else{
             return $this->json_return(201,$data);
         }
-
     }
 
-
     public function departAdd(Request $request)
     {
-
-
         $service = new EmployeeService();
-        $user = $request->get('auth');
-        list($status,$data) = $service->departAdd($request->all(),$request->all());
+        $user = $request->userData->toArray();
+        list($status,$data) = $service->departAdd($request->all(),$user);
 
         if($status){
             return $this->json_return(200,'',$data);
@@ -186,13 +141,10 @@ class EmployeeController extends BaseController
 
     }
 
-
     public function departDel(Request $request)
     {
-
-
         $service = new EmployeeService();
-        $user = $request->get('auth');
+        $user = $request->userData->toArray();
         list($status,$data) = $service->departDel($request->all());
 
         if($status){
@@ -203,13 +155,10 @@ class EmployeeController extends BaseController
 
     }
 
-
     public function departList(Request $request)
     {
-
-
         $service = new EmployeeService();
-        $user = $request->get('auth');
+        $user = $request->userData->toArray();
         list($status,$data) = $service->departList($request->all());
 
         if($status){
@@ -220,13 +169,10 @@ class EmployeeController extends BaseController
 
     }
 
-
     public function teamEdit(Request $request)
     {
-
-
         $service = new EmployeeService();
-        $user = $request->get('auth');
+        $user = $request->userData->toArray();
         list($status,$data) = $service->teamEdit($request->all());
 
         if($status){
@@ -237,30 +183,23 @@ class EmployeeController extends BaseController
 
     }
 
-
     public function teamAdd(Request $request)
     {
-
-
         $service = new EmployeeService();
-        $user = $request->get('auth');
-        list($status,$data) = $service->teamAdd($request->all(),$request->all());
+        $user = $request->userData->toArray();
+        list($status,$data) = $service->teamAdd($request->all(),$user);
 
         if($status){
             return $this->json_return(200,'',$data);
         }else{
             return $this->json_return(201,$data);
         }
-
     }
 
-
     public function teamDel(Request $request)
     {
-
-
         $service = new EmployeeService();
-        $user = $request->get('auth');
+        $user = $request->userData->toArray();
         list($status,$data) = $service->teamDel($request->all());
 
         if($status){
@@ -268,16 +207,12 @@ class EmployeeController extends BaseController
         }else{
             return $this->json_return(201,$data);
         }
-
     }
 
-
     public function teamList(Request $request)
     {
-
-
         $service = new EmployeeService();
-        $user = $request->get('auth');
+        $user = $request->userData->toArray();
         list($status,$data) = $service->teamList($request->all());
 
         if($status){
@@ -288,13 +223,10 @@ class EmployeeController extends BaseController
 
     }
 
-
     public function employeeDepart(Request $request)
     {
-
-
         $service = new EmployeeService();
-        $user = $request->get('auth');
+        $user = $request->userData->toArray();
         list($status,$data) = $service->employeeDepart($request->all());
 
         if($status){
@@ -302,17 +234,12 @@ class EmployeeController extends BaseController
         }else{
             return $this->json_return(201,$data);
         }
-
     }
 
-
-
     public function employeeTeam(Request $request)
     {
-
-
         $service = new EmployeeService();
-        $user = $request->get('auth');
+        $user = $request->userData->toArray();
         list($status,$data) = $service->employeeTeam($request->all());
 
         if($status){
@@ -323,14 +250,10 @@ class EmployeeController extends BaseController
 
     }
 
-
-
     public function employeeRole(Request $request)
     {
-
-
         $service = new EmployeeService();
-        $user = $request->get('auth');
+        $user = $request->userData->toArray();
         list($status,$data) = $service->employeeRole($request->all());
 
         if($status){
@@ -338,10 +261,5 @@ class EmployeeController extends BaseController
         }else{
             return $this->json_return(201,$data);
         }
-
     }
-
-
-
-
 }

app/Http/Controllers/Api/LoginController.php

@@ -9,14 +9,6 @@ use Illuminate\Support\Facades\Log;
 //登录
 class LoginController extends BaseController
 {
-    const MOBILE = '[mobile]';// 手机端
-    const PERSONAL_COMPUTER = '[personalComputer]';// 电脑端
-
-    public static $port = [
-        self::MOBILE => '',
-        self::PERSONAL_COMPUTER => '',
-    ];
-
     public function login(Request $request){
         $data = $request->only("account","password");
 
@@ -25,28 +17,9 @@ class LoginController extends BaseController
         list($bool, $return) = $result;
         if(! $bool) return $this->json_return(201,'',$return);
 
-        //日志
-        $res = Log::channel('login')->info("登录成功", $return);
-
         //生成token
         $jwtToken = TokenService::getToken($return['id']);
-        $jwtToken = self::PERSONAL_COMPUTER . $jwtToken;
 
         return $this->json_return(200,'', ['token' => $jwtToken, 'emp_name'=>$return['name']]);
     }
-
-    public function loginMobile(Request $request){
-        $data = $request->only("account","password");
-
-        //登录
-        $result = (new EmployeeService())->loginRule($data);
-        list($bool, $return) = $result;
-        if(! $bool) return $this->json_return(201,'',$return);
-
-        //生成token
-        $jwtToken = TokenService::getToken($return['id']);
-        $jwtToken = self::MOBILE . $jwtToken;
-
-        return $this->json_return(200,'', ['token' => $jwtToken]);
-    }
 }

app/Http/Controllers/Api/OaController.php

@@ -35,7 +35,7 @@ class OaController extends BaseController
 
 
         $service = new OaService();
-        $user = $request->get('auth');
+        $user = $request->userData->toArray();
         list($status,$data) = $service->oaDetail($request->all());
 
         if($status){
@@ -51,7 +51,7 @@ class OaController extends BaseController
 
 
         $service = new OaService();
-        $user = $request->get('auth');
+        $user = $request->userData->toArray();
         list($status,$data) = $service->oaAdd($request->all());
 
         if($status){
@@ -67,7 +67,7 @@ class OaController extends BaseController
 
 
         $service = new OaService();
-        $user = $request->get('auth');
+        $user = $request->userData->toArray();
         list($status,$data) = $service->oaEdit($request->all());
 
         if($status){
@@ -83,7 +83,7 @@ class OaController extends BaseController
 
 
         $service = new OaService();
-        $user = $request->get('auth');
+        $user = $request->userData->toArray();
         list($status,$data) = $service->oaDel($request->all());
 
         if($status){
@@ -100,7 +100,7 @@ class OaController extends BaseController
 
 
         $service = new OaService();
-        $user = $request->get('auth');
+        $user = $request->userData->toArray();
         list($status,$data) = $service->createOaOrder($request->all());
 
         if($status){
@@ -118,7 +118,7 @@ class OaController extends BaseController
 
 
         $service = new OaService();
-        $user = $request->get('auth');
+        $user = $request->userData->toArray();
         list($status,$data) = $service->oaOrderList($request->all());
 
         if($status){
@@ -163,7 +163,7 @@ class OaController extends BaseController
 
 
         $service = new OaService();
-        $user = $request->get('auth');
+        $user = $request->userData->toArray();
         list($status,$data) = $service->oaSubType($request->all());
 
         if($status){

app/Http/Controllers/Api/SysMenuController.php

@@ -19,7 +19,7 @@ class SysMenuController extends BaseController
 
 
         $service = new SysMenuService();
-        $user = $request->get('auth');
+        $user = $request->userData->toArray();
         list($status,$data) = $service->add($request->all(),$request->all());
 
         if($status){
@@ -36,7 +36,7 @@ class SysMenuController extends BaseController
 
 
         $service = new SysMenuService();
-        $user = $request->get('auth');
+        $user = $request->userData->toArray();
         list($status,$data) = $service->edit($request->all());
 
         if($status){
@@ -53,7 +53,7 @@ class SysMenuController extends BaseController
 
 
         $service = new SysMenuService();
-        $user = $request->get('auth');
+        $user = $request->userData->toArray();
         list($status,$data) = $service->del($request->all());
 
         if($status){
@@ -70,7 +70,7 @@ class SysMenuController extends BaseController
 
 
         $service = new SysMenuService();
-        $user = $request->get('auth');
+        $user = $request->userData->toArray();
         list($status,$data) = $service->menuList($request->all());
 
         if($status){

app/Http/Controllers/Api/TechnologyController.php

@@ -10,7 +10,7 @@ class TechnologyController extends BaseController
     public function technologyList(Request $request)
     {
         $service = new TechnologyService();
-        $user = $request->get('auth');
+        $user = $request->userData->toArray();
         list($status,$data) = $service->technologyList($request->all(),$request->all());
 
         if($status){
@@ -23,7 +23,7 @@ class TechnologyController extends BaseController
     public function technologyEdit(Request $request)
     {
         $service = new TechnologyService();
-        $user = $request->get('auth');
+        $user = $request->userData->toArray();
         list($status,$data) = $service->technologyEdit($request->all(),$request->all());
 
         if($status){
@@ -36,7 +36,7 @@ class TechnologyController extends BaseController
     public function technologyAdd(Request $request)
     {
         $service = new TechnologyService();
-        $user = $request->get('auth');
+        $user = $request->userData->toArray();
         list($status,$data) = $service->technologyAdd($request->all(),$request->all());
 
         if($status){
@@ -49,7 +49,7 @@ class TechnologyController extends BaseController
     public function technologyDel(Request $request)
     {
         $service = new TechnologyService();
-        $user = $request->get('auth');
+        $user = $request->userData->toArray();
         list($status,$data) = $service->technologyDel($request->all(),$request->all());
 
         if($status){
@@ -62,7 +62,7 @@ class TechnologyController extends BaseController
     public function technologyCopy(Request $request)
     {
         $service = new TechnologyService();
-        $user = $request->get('auth');
+        $user = $request->userData->toArray();
         list($status,$data) = $service->technologyCopy($request->all(),$request->all());
 
         if($status){

app/Http/Middleware/CheckLogin.php

@@ -23,14 +23,6 @@ class CheckLogin
             return  response()->json(['code'=>1,'msg'=>'缺少token','data'=>null]);
         }
 
-        //登录来源前缀清除
-        foreach (LoginController::$port as $key => $value){
-            if (strpos($token,$key) !== false) {
-                $token = str_replace($key, $value, $token);
-                break;
-            }
-        }
-
         //校验token
         $result = TokenService::verifyToken($token);
         if ($result < 0){

app/Service/EmployeeService.php

@@ -56,7 +56,7 @@ class EmployeeService extends Service
         $model->is_admin = $data['is_admin'];
         if($model->is_admin == 1){
             $model->account = $data['account'];
-            $model->password   = Hash::make($data['password']);
+            $model->password = Hash::make($data['password']);
         }
         $model->save();
 
@@ -73,12 +73,76 @@ class EmployeeService extends Service
         return [true,'删除成功'];
     }
 
-    public function employeeList($data){
-        $list = Employee::where('del_time',0)->select('id_card','emp_name','mobile','crt_time','account','is_admin','upd_time','id')->orderBy('id','desc');
+    public function employeeList($data,$user){
+        $model = Employee::where('del_time',0)
+            ->select('number','mobile','emp_name','id','entry_time','leave_time','is_technical','is_admin','state')
+            ->orderBy('id','desc');
+
+        if(! empty($data['depart_id'])) {
+            $depart = Depart::where('del_time',0)
+                ->select('id','parent_id')
+                ->get()->toArray();
+            $result = array_merge($this->getAllDescendants($depart,$data['depart_id']),[$data['depart_id']]);
+            $employee_id = DB::table('employee_depart_permission')
+                ->whereIn("depart_id", $result)
+                ->select("employee_id")
+                ->get()->toArray();
+            $employee_id = array_column($employee_id,'employee_id');
+            $model->whereIn("id", $employee_id);
+        }
+        if(! empty($data['number'])) $model->where('number', 'LIKE', '%'.$data['number'].'%');
+        if(! empty($data['emp_name'])) $model->where('emp_name', 'LIKE', '%'.$data['emp_name'].'%');
+        if(! empty($data['state'])) $model->where('state',$data['state']);
+        if(! empty($data['mobile'])) $model->where('mobile', 'LIKE', '%'.$data['mobile'].'%');
+        if(! isset($data['all_emp'])) $model->where('id','<>',Employee::SPECIAL_ADMIN);
+        if(! empty($data['role'])) {
+            $emp = EmployeeRole::where('role_id',$data['role'])
+                ->where('del_time',0)
+                ->select('employee_id')->get()->toArray();
+            $model->whereIn('id',array_column($emp,'employee_id'));
+        }
+        $list = $this->limit($model,'',$data);
 
-        $list = $this->limit($list,'',$data);
+        //组织数据
+        $list = $this->organizationEmployeeData($list);
 
-        return [200,$list];
+        return [true , $list];
+    }
+
+    public function organizationEmployeeData($data) {
+        if (empty($data['data'])) return $data;
+
+        $res = DB::table('employee_role as a')
+            ->leftJoin('role as b','a.role_id','=','b.id')
+            ->where('a.del_time',0)
+            ->where('b.del_time',0)
+            ->whereIn("a.employee_id",array_column($data['data'],'id'))
+            ->select('a.employee_id','b.title','b.id')
+            ->get()->toArray();
+        $role = $role2 = [];
+        foreach ($res as $value){
+            if(isset($role[$value->employee_id])){
+                $role[$value->employee_id] .= ',' . $value->title;
+            }else{
+                $role[$value->employee_id] = $value->title;
+            }
+            $role2[$value->employee_id][] = $value->id;
+        }
+
+        $res = DB::table('employee_depart_permission as a')
+            ->select('a.employee_id','b.title','b.id')
+            ->join('depart as b','a.depart_id','=','b.id')
+            ->whereIn("a.employee_id",array_column($data['data'],'id'))
+            ->get()->toArray();
+        $map = array_column($res,null,'employee_id');
+
+        foreach ($data['data'] as $key => $value){
+            $data['data'][$key]['role'] = $role2[$value['id']] ?? [];
+            $data['data'][$key]['role_name'] = $role[$value['id']] ?? '';
+            $data['data'][$key]['depart_id'] = $map[$value['id']]->id ?? '';
+            $data['data'][$key]['depart_title'] = $map[$value['id']]->title ?? '';
+        }
+        return $data;
     }
 
     public function employeeRule($data,$is_add = true){
@@ -117,13 +181,9 @@ class EmployeeService extends Service
         $model->title = $data['title'];
         $model->save();
         return [true,'保存成功！'];
-
     }
 
     public function roleAdd($data,$user){
-
-
-//        if($this->isEmpty($data,'title')) return [201,'名称不存在！'];
         list($status,$msg) = $this->roleRule($data);
         if(!$status) return [$status,$msg];
         $first = SysMenu::where('title',$data['title'])->where('del_time',0)->first();