1

application/admin/controller/Kfnotice.php

@@ -72,6 +72,8 @@ class Kfnotice extends Base
                 })->limit($offset, $limit)->order('id', 'desc')->select();
             }
 
+            //管理员
+            $admins = db('admins')->select();
 
             foreach ($result as $key => $vo) {
                 $vo->readtime = empty($vo->readtime) ? '' : date('Y-m-d H:i:s', $vo->readtime);
@@ -79,6 +81,11 @@ class Kfnotice extends Base
                 unset($vo->kfuser);
                 $vo->sendtype = $vo->sendtype == 1 ? '即时发送' : '预约发送';
                 $result[$key] = array_merge($vo->toArray(), ['operate' => $this->makeBtn($vo->id)]);
+                for($i=0;$i<count($admins);$i++){
+                    if($vo['admin_id'] == $admins[$i]['id']){
+                        $result[$key]['admin_name'] = $admins[$i]['user_name'];
+                    }
+                }
             }
 
             if (!$bibao) {
@@ -134,6 +141,7 @@ class Kfnotice extends Base
                     'atext' => $atext,
                     'sendtime' => $sendtime,
                     'sendtype' => $sendtype,
+                    'admin_id' => session('user_id'),
                 ];
                 $datas[] = $arr;
             } else {
@@ -152,6 +160,7 @@ class Kfnotice extends Base
                         'atext' => $atext,
                         'sendtime' => $sendtime,
                         'sendtype' => $sendtype,
+                        'admin_id' => session('user_id'),
                     ];
                     $datas[] = $arr;
                 }

application/admin/view/kfnotice/index.html

@@ -86,6 +86,7 @@
                         <th data-field="ctime">创建时间</th>
                         <th data-field="sendtime">发送时间</th>
                         <th data-field="readtime">读取时间</th>
+                        <th data-field="admin_name">发件人</th>
                         <th data-field="operate">操作</th>
                         </thead>
                     </table>

application/service/controller/Index.php

@@ -214,7 +214,14 @@ class Index extends Common
         $user_id = input('post.user_id');
         //获取未读公告
         try{
-            $readnotice = db('servicenotice')->field('id,uid,title,atext,sendtime')->where('readtime',0)->where('uid',$user_id)->where('sendtime','<',date('Y-m-d H:i:s',time()))->order('sendtime','desc')->select();
+            $admins = db('admins')->select();
+            $readnotice = db('servicenotice')->field('id,uid,title,atext,sendtime,admin_id')->where('readtime',0)->where('uid',$user_id)->where('sendtime','<',date('Y-m-d H:i:s',time()))->order('sendtime','desc')->select();
+            for($i=0;$i<count($readnotice);$i++){
+                for($j=0;$j<count($admins);$j++)
+                    if($readnotice[$i]['admin_id'] == $admins[$j]['id']){
+                        $readnotice[$i]['admin_name'] = $admins[$j]['user_name'];
+                    }
+            }
             return json(['code' => 1, 'data' => $readnotice, 'msg' => '成功']);
         } catch (\Exception $e) {
             return json(['code' => -2, 'data' => '', 'msg' => $e->getMessage()]);
@@ -232,7 +239,14 @@ class Index extends Common
         $user_id = input('post.user_id');
         //获取已读公告
         try{
-            $unreadnotice = db('servicenotice')->field('id,uid,title,atext,sendtime')->where('readtime','<>',0)->where('uid',$user_id)->order('sendtime','desc')->select();
+            $admins = db('admins')->select();
+            $unreadnotice = db('servicenotice')->field('id,uid,title,atext,sendtime,admin_id')->where('readtime','<>',0)->where('uid',$user_id)->order('sendtime','desc')->select();
+            for($i=0;$i<count($unreadnotice);$i++){
+                for($j=0;$j<count($admins);$j++)
+                if($unreadnotice[$i]['admin_id'] == $admins[$j]['id']){
+                    $unreadnotice[$i]['admin_name'] = $admins[$j]['user_name'];
+                }
+            }
             return json(['code' => 1, 'data' => $unreadnotice, 'msg' => '成功']);
         } catch (\Exception $e) {
             return json(['code' => -3, 'data' => '', 'msg' => $e->getMessage()]);