|
@@ -66,12 +66,12 @@ class MessageRuleRepository
|
|
|
|
|
|
$data = [
|
|
|
'title' => $request['title'],
|
|
|
- 'content' => isset($request['content'])? $request['content']:'',
|
|
|
+ 'content' => isset($request['content']) && $request['message_type'] == 'system'? $request['content']:'',
|
|
|
'notice_groups' => $noticeGroups,
|
|
|
'message_type' => $request['message_type'],
|
|
|
- 'message_show_type' => isset($request['message_show_type'])? $request['message_show_type']:'',
|
|
|
- 'activity_url' => isset($request['activity_url'])? $request['activity_url']:'',
|
|
|
- 'cover' => $request['cover'],
|
|
|
+ 'message_show_type' => isset($request['message_show_type']) && $request['message_type'] == 'star'? $request['message_show_type']:'',
|
|
|
+ 'activity_url' => isset($request['activity_url']) && $request['message_type'] == 'star'? $request['activity_url']:'',
|
|
|
+ 'cover' => $request['message_type'] == 'star'? $request['cover']:'',
|
|
|
'message_status' => 0,
|
|
|
'send_time' => isset($request['send_time']) && $request['send_time']? $request['send_time']:null,
|
|
|
'activity_time' => $request['activity_time']??'',
|
|
@@ -126,10 +126,13 @@ class MessageRuleRepository
|
|
|
$message->title = $request['title'];
|
|
|
$message->notice_groups = $noticeGroups;
|
|
|
$message->message_type = $request['message_type'];
|
|
|
- $message->cover = $request['cover'];
|
|
|
+
|
|
|
+ if(isset($request['cover'])){
|
|
|
+ $message->cover = $request['cover'];
|
|
|
+ }
|
|
|
|
|
|
if(isset($request['activity_url'])){
|
|
|
- $message->notice_groups = $request['activity_url'];
|
|
|
+ $message->activity_url = $request['activity_url'];
|
|
|
}
|
|
|
if(isset($request['message_show_type'])){
|
|
|
$message->message_show_type = $request['message_show_type'];
|