edit

journal/database/cate.php

@@ -28,8 +28,16 @@ return array
     'order' => 9,
     'end' => array
     (
-        'update' => 'passport/lib/manage.updateSystem',
-        'insert' => 'passport/lib/manage.updateSystem',
+        'update' => array
+        (
+            'passport/lib/manage.updateSystem',
+            'manage/top.sync',
+        ),
+        'insert' => array
+        (
+            'passport/lib/manage.updateSystem',
+            'manage/top.sync',
+        )
     ),
     # 数据结构
     'struct' => array
@@ -187,6 +195,20 @@ return array
         //'edit' => false,
     ),
 
+    'top' => array
+    (
+        # 数据来源
+        'data' => 'state',
+        # 菜单名
+        'name' => '项目选择',
+        # 默认值
+        'value' => 1,
+        # 对应的字段值，设置这个之后，所有设置等于这个值的字段，都要遵循这个权限的控制
+        'key' => Dever::config('base')->top,
+        # 本表中代表名称的字段
+        'col' => 'name',
+    ),
+
     'request' => array
     (
         'getAll' => array

main/lib/Core.php

@@ -65,7 +65,8 @@ class Core
 
         if ($type && $id) {
             $table = Dever::config('base')->type_table[$type];
-            $info = Dever::db($table)->getOne($id);
+            //$info = Dever::db($table)->getOne($id);
+            $info = Dever::db($table)->one($id);
             if ($info) {
                 return $this->getInfo($type, $info, $content);
             } else {

main/src/Journal.php

@@ -800,7 +800,7 @@ class Journal extends Core
         $info = Dever::db('journal/order')->one(array('order_id' => $order));
 
         if ($info) {
-            return $this->createOrder();
+            return $this->createOrder($prefix);
         }
 
         return $order;

service/src/Base.php

@@ -94,7 +94,7 @@ class Base
         $info = Dever::db('journal/order')->one(array('order_id' => $order));
 
         if ($info) {
-            return $this->createOrder();
+            return $this->createOrder($prefix);
         }
 
         return $order;

stat/database/journal.php

@@ -27,14 +27,15 @@ $list = array
 
         'start_day_int' => array('yes-day_int', '>='),
         'end_day_int' => array('yes-day_int', '<='),
+        'cate_id' => 'yes',
         'journal_id' => 'yes',
         'state' => 1,
     ),
     'type' => 'all',
     'order' => array('day_int' => 'desc', 'id' => 'desc'),
-    'group' => 'day_int',
+    'group' => 'day_int,cate_id',
     'page' => array(20, 'list'),
-    'col' => 'id,sum(order_num) as order_num,sum(order_yes_num) as order_yes_num,sum(order_no_num) as order_no_num,sum(buy_num) as buy_num,sum(buy_cash) as buy_cash,cdate,journal_id,day_int,day_string',
+    'col' => 'id,sum(order_num) as order_num,sum(order_yes_num) as order_yes_num,sum(order_no_num) as order_no_num,sum(buy_num) as buy_num,sum(buy_cash) as buy_cash,cdate,journal_id,day_int,day_string,cate_id',
 );
 
 $search = Dever::input('search_option_journal_id');
@@ -99,6 +100,7 @@ return array
             'update'    => 'select',
             'option'    => $cate,
             'search'    => 'select',
+            'list'      => true,
         ),
 
         'journal_id'      => array

stat/database/source.php

@@ -38,20 +38,21 @@ $list = array
         'start_day_int' => array('yes-day_int', '>='),
         'end_day_int' => array('yes-day_int', '<='),
         'source_id' => 'yes',
+        'cate_id' => 'yes',
         'journal_id' => 'yes',
         'state' => 1,
     ),
     'type' => 'all',
     'order' => array('day_int' => 'desc', 'id' => 'desc'),
-    'group' => 'day_int,source_id',
+    'group' => 'day_int,source_id,cate_id',
     'page' => array(20, 'list'),
-    'col' => 'id,pv,uv,user_num,user_yes_num,sum(order_num) as order_num,sum(order_yes_num) as order_yes_num,sum(order_no_num) as order_no_num,sum(buy_num) as buy_num,sum(buy_cash) as buy_cash,cdate,journal_id,source_id,day_int,day_string',
+    'col' => 'id,pv,uv,user_num,user_yes_num,sum(order_num) as order_num,sum(order_yes_num) as order_yes_num,sum(order_no_num) as order_no_num,sum(buy_num) as buy_num,sum(buy_cash) as buy_cash,cdate,journal_id,source_id,day_int,day_string,cate_id',
 );
 
 $search = Dever::input('search_option_journal_id');
 if ($search && $search > 0) {
     unset($list['group']);
-    $list['col'] = 'id,order_num,order_yes_num,order_no_num,buy_num,buy_cash,cdate,journal_id,source_id,day_int,day_string';
+    $list['col'] = 'id,order_num,order_yes_num,order_no_num,buy_num,buy_cash,cdate,journal_id,source_id,day_int,day_string,cate_id';
 }
 
 $config = array
@@ -123,6 +124,7 @@ $config = array
             'update'    => 'select',
             'option'    => $cate,
             'search'    => 'select',
+            'list'      => true,
         ),
 
         'journal_id'      => array