|
@@ -357,6 +357,7 @@ class WeixinService extends Service
|
|
|
$modelDetail->only_fans_can_comment = $val['only_fans_can_comment'];
|
|
|
$modelDetail->is_deleted = $val['is_deleted'];
|
|
|
$modelDetail->upd_time = $value['content']['update_time'];
|
|
|
+ $modelDetail->crt_time = $value['content']['create_time'];
|
|
|
$modelDetail->save();
|
|
|
}
|
|
|
}
|
|
@@ -399,6 +400,7 @@ class WeixinService extends Service
|
|
|
$modelDetail->only_fans_can_comment = $val['only_fans_can_comment'];
|
|
|
$modelDetail->is_deleted = $val['is_deleted'];
|
|
|
$modelDetail->upd_time = $value['content']['update_time'];
|
|
|
+ $modelDetail->crt_time = $value['content']['create_time'];
|
|
|
$modelDetail->save();
|
|
|
}
|
|
|
}
|
|
@@ -460,4 +462,44 @@ class WeixinService extends Service
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+ public function getArticleList($data){
|
|
|
+ $model = WxArticleDetail::where('del_time',0)
|
|
|
+ ->where('is_deleted', 'false')
|
|
|
+ ->select('title','author','digest','thumb_url','content_name')
|
|
|
+ ->orderBy('id','desc');
|
|
|
+
|
|
|
+ if(! empty($data['depart'])) {
|
|
|
+ $depart = Depart::where('del_time',0)
|
|
|
+ ->select('id','parent_id')
|
|
|
+ ->get()->toArray();
|
|
|
+ $result = array_merge($this->getAllDescendants($depart,$data['depart']),[$data['depart']]);
|
|
|
+ $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['card_no'])) $model->where('card_no', 'LIKE', '%'.$data['card_no'].'%');
|
|
|
+ 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->organizationEmployeeData($list);
|
|
|
+
|
|
|
+ return [true , $list];
|
|
|
+ }
|
|
|
}
|