|
|
@@ -9002,6 +9002,7 @@ class NewsService implements NewsServiceInterface
|
|
|
unset($data['id']);
|
|
|
if(!empty($data['reply'])){
|
|
|
$data['reply_userid'] = $data['user_id'];
|
|
|
+ unset($data['user_id']);
|
|
|
}
|
|
|
$result = Message::where('id', $message['id'])->update($data);
|
|
|
if (empty($result)) {
|
|
|
@@ -9080,12 +9081,19 @@ class NewsService implements NewsServiceInterface
|
|
|
if (empty($user)) {
|
|
|
return Result::error('用户不存在');
|
|
|
}
|
|
|
- if($user['type_id'] != 10000){
|
|
|
+ $column_arr_id = [];
|
|
|
+ if($user['type_id'] != 10000 && !empty($data['website_id'])){
|
|
|
$where['user_id'] = $data['user_id'];
|
|
|
+ $web = Website::where('id',$data['website_id'])->first('website_column_arr_id');
|
|
|
+ if(empty($web)){
|
|
|
+ return Result::error('此网站未关联任何网站属性!');
|
|
|
+ }
|
|
|
+ $column_arr_id = json_decode($web['website_column_arr_id'],true);
|
|
|
}
|
|
|
if(!empty($data['title'])){
|
|
|
array_push($where, ['title', 'like', '%'.$data['title'].'%']);
|
|
|
}
|
|
|
+
|
|
|
$result = Message::when($data['is_master'] == 0, function ($query) {
|
|
|
$query->whereIn('status', [0, 2]);
|
|
|
})
|
|
|
@@ -9094,13 +9102,22 @@ class NewsService implements NewsServiceInterface
|
|
|
})
|
|
|
->orderBy('updated_at', 'desc')
|
|
|
->paginate($data['page_size'], ['*'], 'page', $data['page']);
|
|
|
- if(empty($result)) {
|
|
|
+ if(empty($result->items())) {
|
|
|
return Result::error('留言不存在!');
|
|
|
}
|
|
|
$result = [
|
|
|
'data' => $result->items(),
|
|
|
'count' => $result->total(),
|
|
|
];
|
|
|
+ if(!empty($column_arr_id) && $user['type_id'] != 10000){
|
|
|
+ foreach($result['data'] as $key => $value){
|
|
|
+ if(in_array($value['column_id'], $column_arr_id)){
|
|
|
+ $result['data'][$key]['is_update'] = 1;
|
|
|
+ }else{
|
|
|
+ $result['data'][$key]['is_update'] = 0;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
return Result::success($result);
|
|
|
}
|
|
|
/**
|