dever 6 年之前
父節點
當前提交
c077fece67
共有 2 個文件被更改,包括 11 次插入1 次删除
  1. 7 1
      code/database/info.php
  2. 4 0
      main/src/Journal.php

+ 7 - 1
code/database/info.php

@@ -64,6 +64,12 @@ return array
 			'default' 	=> '-1',
 			'desc' 		=> '创建人',
 			'match' 	=> 'is_numeric',
+			'search'    => array
+            (
+                'api' => 'passport/user-all',
+                'col' => 'username',
+                'result' => 'id',
+            ),
 			//'list'		=> 'Dever::load("code/lib/manage.showUserInfo", "{uid}", "{ldate}")',
 		),
 
@@ -255,7 +261,7 @@ return array
             ),
             'type' => 'all',
             'order' => array('cdate' => 'desc'),
-            'page' => array(10, 'list'),
+            'page' => array(10000, 'list'),
             'col' => '*',
         ),
     )

+ 4 - 0
main/src/Journal.php

@@ -745,6 +745,10 @@ class Journal extends Core
 
         if ($info['type'] == 21 && $info['talk']) {
             $info['talk'] = Dever::array_decode($info['talk']);
+            foreach ($info['talk'] as $k => $v) {
+                $info['talk'][$k]['talk_type'] = implode(',', $v['talk_type']);
+                $info['talk'][$k]['talk_location'] = implode(',', $v['talk_location']);
+            }
         } else {
             unset($info['talk']);
         }