diff --git a/application/common/controller/Backend.php b/application/common/controller/Backend.php index b70eede87b38fd8e244410dcb10a5f607cb6218b..0704654bc39e4c0b998ed5cc0a4b73a399a4f519 100644 --- a/application/common/controller/Backend.php +++ b/application/common/controller/Backend.php @@ -397,7 +397,8 @@ class Backend extends Controller $arr = $arr[0]; } $tableArr = explode('.', $k); - if (count($tableArr) > 1 && $tableArr[0] != $name && !in_array($tableArr[0], $alias) && !empty($this->model)) { + if (count($tableArr) > 1 && $tableArr[0] != $name && !in_array($tableArr[0], $alias) + && !empty($this->model) && $this->relationSearch) { //修复关联模型下时间无法搜索的BUG $relation = Loader::parseName($tableArr[0], 1, false); $alias[$this->model->$relation()->getTable()] = $tableArr[0]; diff --git a/public/assets/js/require-table.js b/public/assets/js/require-table.js index 807edeba626b79aed087da71580005f671da5549..1da5b20986cd512a6cbd39e6921286e1d8a307e9 100644 --- a/public/assets/js/require-table.js +++ b/public/assets/js/require-table.js @@ -914,7 +914,8 @@ define(['jquery', 'bootstrap', 'moment', 'moment/locale/zh-cn', 'bootstrap-table row.ids = ids ? ids : (typeof row.ids !== 'undefined' ? row.ids : 0); url = url == null || url.length === 0 ? '' : url.toString(); //自动添加ids参数 - url = !url.match(/\{ids\}/i) ? url + (url.match(/(\?|&)+/) ? "&ids=" : "/ids/") + '{ids}' : url; + url = !url.match(/(?=([?&]ids=)|(\/ids\/)|(\{ids}))/i) ? + url + (url.match(/(\?|&)+/) ? "&ids=" : "/ids/") + '{ids}' : url; url = url.replace(/\{(.*?)\}/gi, function (matched) { matched = matched.substring(1, matched.length - 1); if (matched.indexOf(".") !== -1) {