作者 李宇航

合并分支 'lyh-server' 到 'master'

gx



查看合并请求 !1734
@@ -122,8 +122,6 @@ class ChatLogic extends BaseLogic @@ -122,8 +122,6 @@ class ChatLogic extends BaseLogic
122 $saveData = [ 122 $saveData = [
123 'user_id'=>$this->user['id'], 123 'user_id'=>$this->user['id'],
124 'input_content'=>mb_substr($message, 0, 50, "UTF-8").'...', 124 'input_content'=>mb_substr($message, 0, 50, "UTF-8").'...',
125 - 'last_created_at'=>date('Y-m-d H:i:s'),  
126 - 'last_input_content'=>mb_substr($message, 0, 50, "UTF-8").'...'  
127 ]; 125 ];
128 return $this->model->addReturnId($saveData); 126 return $this->model->addReturnId($saveData);
129 } 127 }
@@ -145,7 +143,7 @@ class ChatLogic extends BaseLogic @@ -145,7 +143,7 @@ class ChatLogic extends BaseLogic
145 ]; 143 ];
146 //同时更改主任务 144 //同时更改主任务
147 $this->itemModel->addReturnId($saveData); 145 $this->itemModel->addReturnId($saveData);
148 - $data = ['last_created_at'=>date('Y-m-d H:i:s'),'last_input_content'=>mb_substr($message, 0, 50, "UTF-8")]; 146 + $data = ['last_created_at'=>date('Y-m-d H:i:s'),'last_input_content'=>mb_substr($message, 0, 50, "UTF-8").'...'];
149 return $this->model->edit($data,['id'=>$id]); 147 return $this->model->edit($data,['id'=>$id]);
150 } 148 }
151 } 149 }