dever 6 years ago
parent
commit
787f2a604d
2 changed files with 3 additions and 2 deletions
  1. 0 1
      stat/database/journal.php
  2. 3 1
      stat/database/source.php

+ 0 - 1
stat/database/journal.php

@@ -67,7 +67,6 @@ if ($search && $search != -1 && isset($search[1]) && $search[1] > 0) {
     Dever::setInput('search_option_journal_id', $search[1]);
     Dever::setInput('search_option_journal_id', $search[1]);
 }
 }
 if (!$zhou) {
 if (!$zhou) {
-    Dever::setInput('search_option_journal_id', $search[1]);
     unset($list['group']);
     unset($list['group']);
     $list['col'] = '*';
     $list['col'] = '*';
 }
 }

+ 3 - 1
stat/database/source.php

@@ -73,8 +73,10 @@ $list = array
 
 
 //$search = Dever::input('search_option_journal_id');
 //$search = Dever::input('search_option_journal_id');
 $search = Dever::input('search_linkage_cate_journal');
 $search = Dever::input('search_linkage_cate_journal');
-if (!$zhou && $search && $search != -1 && isset($search[1]) && $search[1] > 0) {
+if ($search && $search != -1 && isset($search[1]) && $search[1] > 0) {
     Dever::setInput('search_option_journal_id', $search[1]);
     Dever::setInput('search_option_journal_id', $search[1]);
+}
+if (!$zhou) {
     unset($list['group']);
     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,cate_id';
     $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';
 }
 }