Merge branch 'master' of github.com:easysoft/zentaopms

2017-08-14 10:05:57 +08:00
parent b91e47c2e7 dccebc7b9a
commit 4f43386af8
4 changed files with 12 additions and 1 deletions
--- a/module/mail/model.php
+++ b/module/mail/model.php
@@ -517,7 +517,7 @@ class mailModel extends model
        $data->ccList    = $ccList;
        $data->subject   = $subject;
        $data->body      = $body;
-        $data->addedBy   = $this->app->user->account;
+        $data->addedBy   = $this->config->mail->fromName;
        $data->addedDate = helper::now();
        $this->dao->insert(TABLE_MAILQUEUE)->data($data)->autocheck()->exec();
    }