菜单按钮

app/Service/EmployeeService.php

@@ -35,7 +35,7 @@ class EmployeeService extends Service
             $model = $model->where('id',$data['id'])->first();
             $model->number = $data['number'];
             $model->emp_name = $data['emp_name'];
-            $model->mobile = $data['mobile'];
+            $model->mobile = $data['mobile'] ?? '';
             $model->leave_time = $data['leave_time'] ?? '';
             $model->entry_time = $data['entry_time'] ?? '';
             $model->is_admin = $data['is_admin'];
@@ -54,8 +54,6 @@ class EmployeeService extends Service
                     $insert[] = [
                         'employee_id' => $model->id,
                         'depart_id' => $value,
-                        'crt_time' => time(),
-                        'upd_time' => time(),
                     ];
                 }
                 EmployeeDepartPermission::insert($insert);
@@ -96,7 +94,7 @@ class EmployeeService extends Service
 
             $model->number = $data['number'];
             $model->emp_name = $data['emp_name'];
-            $model->mobile = $data['mobile'];
+            $model->mobile = $data['mobile'] ?? '';
             $model->leave_time = $data['leave_time'] ?? '';
             $model->entry_time = $data['entry_time'] ?? '';
             $model->state = 1;
@@ -116,8 +114,6 @@ class EmployeeService extends Service
                     $insert[] = [
                         'employee_id' => $model->id,
                         'depart_id' => $value,
-                        'crt_time' => time(),
-                        'upd_time' => time(),
                     ];
                 }
                 EmployeeDepartPermission::insert($insert);
@@ -157,7 +153,7 @@ class EmployeeService extends Service
 
     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')
+            ->select('number','mobile','emp_name','id','entry_time','leave_time','is_admin','state')
             ->orderBy('id','desc');
 
         if(! empty($data['depart_id'])) {
@@ -215,22 +211,31 @@ class EmployeeService extends Service
             ->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'))
+            ->orderBy('b.id')
             ->get()->toArray();
-        $map = array_column($res,null,'employee_id');
+        $depart_title = $depart_id = [];
+        foreach ($res as $value){
+            if(isset($depart_title[$value->employee_id])){
+                $depart_title[$value->employee_id] .= ',' . $value->title;
+            }else{
+                $depart_title[$value->employee_id] = $value->title;
+            }
+            $depart_id[$value->employee_id][] = $value->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 ?? '';
+            $data['data'][$key]['depart'] = $depart_id[$value['id']] ?? [];
+            $data['data'][$key]['depart_title'] = $depart_title[$value['id']] ?? '';
         }
         return $data;
     }
 
     public function employeeRule($data,$is_add = true){
         if($this->isEmpty($data,'number')) return [false,'工号不存在！'];
-        if($this->isEmpty($data,'mobile')) return [false,'手机号不存在！'];
         if($this->isEmpty($data,'emp_name')) return [false,'姓名不存在！'];
+
         if(! $is_add){
             if($this->isEmpty($data,'id')) return [false,'ID不能为空！'];
             $bool = Employee::where('number',$data['number'])