zm/tougao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

建议反馈修改

Browse Source
This commit is contained in:
wangzhaocui
2022-03-28 15:32:58 +08:00
parent adbb5797ce
commit 0c94687d56
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
application/api/controller/Suggest.php
View File

@@ -206,8 +206,8 @@ class Suggest extends Controller{
$where['t_suggest.suggest_state'] = $data['suggest_state']; $where['t_suggest.suggest_state'] = $data['suggest_state'];
} }
$res['data'] = $this->suggest_obj->field('t_suggest.*,t_user.realname,t_problem.problem_title') $res['data'] = $this->suggest_obj->field('t_suggest.*,t_user.realname,t_problem.problem_title')
->join('t_user','t_user.user_id = t_suggest.user_id','RIGHT') ->join('t_user','t_user.user_id = t_suggest.user_id','LEFT')
->join('t_problem','t_problem.problem_id = t_suggest.problem_id','RIGHT') ->join('t_problem','t_problem.problem_id = t_suggest.problem_id','LEFT')
->where($where) ->where($where)
->page($data['pageIndex'],$data['pageSize']) ->page($data['pageIndex'],$data['pageSize'])
->select(); ->select();
@@ -237,8 +237,8 @@ class Suggest extends Controller{
return json(['code' => 1,'msg'=>$rule->getError()]); return json(['code' => 1,'msg'=>$rule->getError()]);
} }
$res = $this->suggest_obj->field('t_suggest.*,t_user.realname,t_problem.problem_title') $res = $this->suggest_obj->field('t_suggest.*,t_user.realname,t_problem.problem_title')
->join('t_user','t_user.user_id = t_suggest.user_id','RIGHT') ->join('t_user','t_user.user_id = t_suggest.user_id','LEFT')
->join('t_problem','t_problem.problem_id = t_suggest.problem_id','RIGHT') ->join('t_problem','t_problem.problem_id = t_suggest.problem_id','LEFT')
->where(['t_suggest.suggest_id'=>$data['suggest_id']]) ->where(['t_suggest.suggest_id'=>$data['suggest_id']])
->find(); ->find();
return jsonSuccess($res); return jsonSuccess($res);
@@ -307,7 +307,8 @@ class Suggest extends Controller{
'sendPassword'=>Env::get('email.send_email_password'), // 发件人密码 'sendPassword'=>Env::get('email.send_email_password'), // 发件人密码
'user_id'=>$userID, //收件人ID 'user_id'=>$userID, //收件人ID
'email'=>$email,// 收件人邮箱 'email'=>$email,// 收件人邮箱
'title'=>'TMR', // 邮件标题 'title'=>'Dear ' . $realname, // 邮件标题
'from_name'=>'TMR',
'content'=>getUserEmail($realname,$caseId),//邮件内容 'content'=>getUserEmail($realname,$caseId),//邮件内容
]; ];
if(isset($insert['suggest_url'])){ if(isset($insert['suggest_url'])){
@@ -324,7 +325,8 @@ class Suggest extends Controller{
'sendPassword'=>Env::get('email.send_email_password'), // 发件人密码 'sendPassword'=>Env::get('email.send_email_password'), // 发件人密码
'user_id'=>0, 'user_id'=>0,
'email'=>Env::get('email.editor_email'),// 收件人邮箱 'email'=>Env::get('email.editor_email'),// 收件人邮箱
'title'=>'TMR', // 邮件标题 'title'=>'Dear editor', // 邮件标题
'from_name'=>'TMR',
'content'=>"Dear editor, please check the new feedback.",//邮件内容 'content'=>"Dear editor, please check the new feedback.",//邮件内容
]; ];
return $editorData; return $editorData;

5
application/api/job/domail.php
View File

@@ -20,7 +20,7 @@ class domail {
* @param type $data * @param type $data
*/ */
public function send($data){ public function send($data){
$res = sendEmail($data['email'],$data['title'],$data['title'],$data['content'],$data['sendEmail'],$data['sendPassword']); $res = sendEmail($data['email'],$data['title'],$data['from_name'],$data['content'],$data['sendEmail'],$data['sendPassword'],$data['attachmentFile']='');
$insert = [ $insert = [
'title'=>$data['title'], 'title'=>$data['title'],
'content'=>$data['content'], 'content'=>$data['content'],
@@ -34,6 +34,9 @@ class domail {
$insert['is_attachment'] = 1; $insert['is_attachment'] = 1;
$insert['attachment_url'] = $data['attachment_url']; $insert['attachment_url'] = $data['attachment_url'];
} }
if(isset($data['journal_id'])){
$insert['journal_id'] = $data['journal_id'];
}
if($res['status']==1){ if($res['status']==1){
$info = Db::name('email')->insert($insert); $info = Db::name('email')->insert($insert);
if(!$info){ if(!$info){