作者 lyh

gx

@@ -28,12 +28,12 @@ class MailController extends BaseController @@ -28,12 +28,12 @@ class MailController extends BaseController
28 if(!empty($lists)){ 28 if(!empty($lists)){
29 $lists = $lists->toArray(); 29 $lists = $lists->toArray();
30 } 30 }
31 -// $mailUserModel = new MailUserModel();  
32 -// $lists['unreadNum'] = $this->unreadNum($mailUserModel,$lists['total']);  
33 -// if(!empty($lists['list'])){  
34 -// //验证未读还是已读  
35 -// $lists['list'] = $this->verifyRead($mailUserModel,$lists['list']);  
36 -// } 31 + $mailUserModel = new MailUserModel();
  32 + $lists['unreadNum'] = $this->unreadNum($mailUserModel,$lists['total']);
  33 + if(!empty($lists['list'])){
  34 + //验证未读还是已读
  35 + $lists['list'] = $this->verifyRead($mailUserModel,$lists['list']);
  36 + }
37 $this->response('success',Code::SUCCESS,$lists); 37 $this->response('success',Code::SUCCESS,$lists);
38 } 38 }
39 39
@@ -11,6 +11,7 @@ use App\Models\Blog\Blog; @@ -11,6 +11,7 @@ use App\Models\Blog\Blog;
11 use App\Models\Channel\Channel; 11 use App\Models\Channel\Channel;
12 use App\Models\Channel\User; 12 use App\Models\Channel\User;
13 use App\Models\Channel\Zone; 13 use App\Models\Channel\Zone;
  14 +use App\Models\Devops\ServerConfig;
14 use App\Models\Inquiry\InquirySet; 15 use App\Models\Inquiry\InquirySet;
15 use App\Models\Manage\Manage; 16 use App\Models\Manage\Manage;
16 use App\Models\News\News; 17 use App\Models\News\News;
@@ -102,6 +103,12 @@ class ProjectLogic extends BaseLogic @@ -102,6 +103,12 @@ class ProjectLogic extends BaseLogic
102 if(isset($info['online_check']['created_manage_id']) && !empty($info['online_check']['created_manage_id'])){ 103 if(isset($info['online_check']['created_manage_id']) && !empty($info['online_check']['created_manage_id'])){
103 $info['online_check']['name'] = ManageLogic::getCacheName($info['online_check']['created_manage_id']); 104 $info['online_check']['name'] = ManageLogic::getCacheName($info['online_check']['created_manage_id']);
104 } 105 }
  106 + if(!empty($info['serve_id'])){
  107 + $info['serve_id_name'] = (new ServerConfig())->read(['id'=>$info['serve_id']])['title'];
  108 + }
  109 + if(!empty($info['mysql_id'])){
  110 + $info['mysql_id_name'] = (new ServerConfig())->read(['id'=>$info['mysql_id']])['title'];
  111 + }
105 return $this->success($info); 112 return $this->success($info);
106 } 113 }
107 public function save($param){ 114 public function save($param){