|
@@ -29,10 +29,12 @@ class InfoController extends Controller
|
|
$request = $reqeust->all();
|
|
$request = $reqeust->all();
|
|
if(isset($request['sort_field']) && $request['sort_field'] && isset($request['sort_field_by'])) {
|
|
if(isset($request['sort_field']) && $request['sort_field'] && isset($request['sort_field_by'])) {
|
|
$query = $query->pushCriteria(new OrderBy($request['sort_field'],$request['sort_field_by']));
|
|
$query = $query->pushCriteria(new OrderBy($request['sort_field'],$request['sort_field_by']));
|
|
|
|
+ }else{
|
|
|
|
+ $query = $query->pushCriteria(new OrderBy('id','desc'));
|
|
}
|
|
}
|
|
$list = $query->paginate();
|
|
$list = $query->paginate();
|
|
foreach ($list as $item) {
|
|
foreach ($list as $item) {
|
|
- $user = UserInfoModel::find($item->user_id);
|
|
|
|
|
|
+ $user = UserInfoModel::find($item->to_user_id);
|
|
$item->nickname = empty($user) ? '' : $user->nickname;
|
|
$item->nickname = empty($user) ? '' : $user->nickname;
|
|
}
|
|
}
|
|
return view('admin.system.info.index',compact('list'));
|
|
return view('admin.system.info.index',compact('list'));
|
|
@@ -67,8 +69,21 @@ class InfoController extends Controller
|
|
* 保存修改
|
|
* 保存修改
|
|
*/
|
|
*/
|
|
private function _createSave(){
|
|
private function _createSave(){
|
|
|
|
+// 给所有用户发送系统消息
|
|
$data = (array) request('data');
|
|
$data = (array) request('data');
|
|
- $id = $this->repository->create($data);
|
|
|
|
|
|
+ $user_ids = UserInfoModel::select('id')->where('status',1)->get()->toArray();
|
|
|
|
+ $arr_ids = array_column($user_ids,'id');
|
|
|
|
+ $arr = [];
|
|
|
|
+ if (!empty($arr_ids)) {
|
|
|
|
+ foreach ($arr_ids as $user_id) {
|
|
|
|
+ $arr[] = [
|
|
|
|
+ 'to_user_id'=>$user_id,
|
|
|
|
+ 'message'=>$data['message'],
|
|
|
|
+ 'created_at'=>date('Y-m-d H:i:s'),
|
|
|
|
+ ];
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ $id = SystemInfoModel::insert($arr);
|
|
if($id) {
|
|
if($id) {
|
|
$url[] = array('url'=>U( 'System/Info/index'),'title'=>'返回列表');
|
|
$url[] = array('url'=>U( 'System/Info/index'),'title'=>'返回列表');
|
|
$url[] = array('url'=>U( 'System/Info/create'),'title'=>'继续添加');
|
|
$url[] = array('url'=>U( 'System/Info/create'),'title'=>'继续添加');
|