1

application/admin/controller/user/Head.php

@@ -77,12 +77,12 @@ class Head extends Backend
             $row->save($row->image_audit);
             SystemMessages::messages('headimg_yes',$ids);
             $time = Date('Y-m-d H:i:s');
-            $row->save(['avatar_time'=>$time,'avatar'=>$row->avatar_new,'avatar_reason'=>'']);
+            $row->save(['avatar_time'=>$time,'avatar'=>$row->avatar_new]);
         }elseif($audit == 2) {
             $row->image_audit = $audit;
-            $row->avatar_reason = $this->request->post('avatar_reason');
+            $reason = '拒绝原因：'.$this->request->post('avatar_reason');
             $row->save($row->image_audit);
-            SystemMessages::messages('headimg_no',$ids);
+            SystemMessages::messages('headimg_no',$ids,$reason);
         }
         $this->success("审核成功");
     }

application/api/controller/Information.php

@@ -82,10 +82,10 @@ class Information extends Api
         $uid = $this->auth->id;
         $systemMessages = SystemMessages::where(['uid'=>$uid,'type'=>1,'status'=>1])->order('id','desc')->select();
         foreach ($systemMessages as $k=>&$v){
-            if($v['title'] == '头像审核未通过'){
-                $v = $v->toarray();
-                $v['content'] = $v['content'] . '拒绝原因：' . User::where(['id'=>$uid])->value('avatar_reason');
-            }
+//            if($v['title'] == '头像审核未通过'){
+//                $v = $v->toarray();
+//                $v['content'] = $v['content'] . '拒绝原因：' . User::where(['id'=>$uid])->value('avatar_reason');
+//            }
             SystemMessages::where('id',$v['id'])->update(['isread'=>1]);
         }
         $this->success('',$systemMessages);

application/common/model/SystemMessages.php

@@ -55,11 +55,16 @@ class SystemMessages extends Model
     /**
      * 系统消息
      */
-    public static function messages($res,$user_id){
+    public static function messages($res,$user_id,$reason = ''){
         Db::startTrans();
         try {
-            if(!is_null($res))
-            SystemMessages::create(['uid' => $user_id, 'title' => self::$operate[$res]['title'], 'content' => self::$operate[$res]['content']]);
+            if(!is_null($res)){
+                if($reason){
+                    SystemMessages::create(['uid' => $user_id, 'title' => self::$operate[$res]['title'], 'content' => self::$operate[$res]['content'].$reason]);
+                }else{
+                    SystemMessages::create(['uid' => $user_id, 'title' => self::$operate[$res]['title'], 'content' => self::$operate[$res]['content']]);
+                }
+            }
             Db::commit();
         } catch (\Exception $e) {
             Db::rollback();