提交代码

app/Http/Controllers/NoticeController.php

@@ -61,10 +61,8 @@ class NoticeController extends Controller
         $obj_id = $request->input('obj_id');
         $obj_id = $request->input('obj_id');
         $act_type = $request->input('act_type');
         $act_type = $request->input('act_type');
         $act_types = ($act_type) ? [$act_type] : [];
         $act_types = ($act_type) ? [$act_type] : [];
-        $data = [
-            "list" => ActionLogService::getLogsByObjId($obj_type, $obj_id, $act_types)
-        ];
-        return $this->codeExport(0, '保存成功',$data);
+
+        return $this->codeExport(0, '保存成功',ActionLogService::getLogsByObjId($obj_type, $obj_id, $act_types));
 
 
     }
     }
 
 

app/Services/ActionLogService.php

@@ -158,6 +158,7 @@ class ActionLogService{
             $create_uids = array_column($action_logs, 'act_uid');
             $create_uids = array_column($action_logs, 'act_uid');
             $cms_user_name_map = self::dataDecode($create_uids);
             $cms_user_name_map = self::dataDecode($create_uids);
             foreach ($action_logs as &$log) {
             foreach ($action_logs as &$log) {
+                $log['content'] = json_decode($log['log_data'],true);
                 $log['log_data'] = self::dataDecode($log['log_data']);
                 $log['log_data'] = self::dataDecode($log['log_data']);
                 $log['create_time'] = empty($log['create_time'])?'':date('Y-m-d H:i:s',$log['create_time']);
                 $log['create_time'] = empty($log['create_time'])?'':date('Y-m-d H:i:s',$log['create_time']);
             }
             }

public/js/Message/MessageList.js

@@ -229,7 +229,7 @@ layui.use(['form', 'table', 'laydate', 'layedit'], function () {
                                 page: false,
                                 page: false,
                                 where: {
                                 where: {
                                     obj_type: 100,
                                     obj_type: 100,
-                                    obj_id: data.id
+                                    obj_id: data.business_notice_id
                                 },
                                 },
                                 cols: [[
                                 cols: [[
                                     { type: 'numbers', title: '序号' },
                                     { type: 'numbers', title: '序号' },