|
@@ -158,21 +158,25 @@ class Database
|
|
private function getUrlParam($key, $table, $suffix, $state)
|
|
private function getUrlParam($key, $table, $suffix, $state)
|
|
{
|
|
{
|
|
$param = '';
|
|
$param = '';
|
|
|
|
+ $oper = '';
|
|
$array = array('project', 'add', 'list', 'update');
|
|
$array = array('project', 'add', 'list', 'update');
|
|
if (in_array($key, $array)) {
|
|
if (in_array($key, $array)) {
|
|
- $where = Dever::preInput('search_');
|
|
|
|
- if ($where) {
|
|
|
|
- if (isset($where['where_id'])) {
|
|
|
|
- //unset($where['where_id']);
|
|
|
|
- }
|
|
|
|
- unset($where['search_option_state']);
|
|
|
|
- $param .= '&' . http_build_query($where);
|
|
|
|
- }
|
|
|
|
|
|
|
|
$oper = Dever::preInput('oper_');
|
|
$oper = Dever::preInput('oper_');
|
|
if ($oper) {
|
|
if ($oper) {
|
|
$param .= '&' . http_build_query($oper);
|
|
$param .= '&' . http_build_query($oper);
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ if (!$oper) {
|
|
|
|
+ $where = Dever::preInput('search_');
|
|
|
|
+ if ($where) {
|
|
|
|
+ if (isset($where['where_id'])) {
|
|
|
|
+ //unset($where['where_id']);
|
|
|
|
+ }
|
|
|
|
+ unset($where['search_option_state']);
|
|
|
|
+ $param .= '&' . http_build_query($where);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
|
|
if ($key == 'search' && $search_limit = Dever::input('search_limit')) {
|
|
if ($key == 'search' && $search_limit = Dever::input('search_limit')) {
|