From 1b615eab97daf462a22db164c91c0b2181c2cdfa Mon Sep 17 00:00:00 2001 From: holan20180123 <56391770@qq.com> Date: Fri, 21 Aug 2020 13:25:54 +0800 Subject: [PATCH] * Edit search risk. --- module/risk/config.php | 4 ++-- module/risk/lang/zh-cn.php | 1 + module/risk/model.php | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/module/risk/config.php b/module/risk/config.php index 5b8c889353..1e0d603fcc 100644 --- a/module/risk/config.php +++ b/module/risk/config.php @@ -52,8 +52,8 @@ $config->risk->search['params']['prevention'] = array('operator' => 'incl $config->risk->search['params']['remedy'] = array('operator' => 'include', 'control' => 'input', 'values' => ''); $config->risk->search['params']['plannedClosedDate'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date'); $config->risk->search['params']['actualClosedDate'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date'); -$config->risk->search['params']['createBy'] = array('operator' => '=', 'control' => 'select', 'values' => 'users'); -$config->risk->search['params']['createDate'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date'); +$config->risk->search['params']['createdBy'] = array('operator' => '=', 'control' => 'select', 'values' => 'users'); +$config->risk->search['params']['createdDate'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date'); $config->risk->search['params']['resolution'] = array('operator' => 'include', 'control' => 'input', 'values' => ''); $config->risk->search['params']['resolvedBy'] = array('operator' => '=', 'control' => 'select', 'values' => 'users'); $config->risk->search['params']['activateBy'] = array('operator' => '=', 'control' => 'select', 'values' => 'users'); diff --git a/module/risk/lang/zh-cn.php b/module/risk/lang/zh-cn.php index b713342a56..60a1814c91 100644 --- a/module/risk/lang/zh-cn.php +++ b/module/risk/lang/zh-cn.php @@ -94,6 +94,7 @@ $lang->risk->priList['high'] = '高'; $lang->risk->priList['middle'] = '中'; $lang->risk->priList['low'] = '低'; +$lang->risk->statusList[''] = ''; $lang->risk->statusList['active'] = '开放'; $lang->risk->statusList['closed'] = '关闭'; $lang->risk->statusList['hangup'] = '挂起'; diff --git a/module/risk/model.php b/module/risk/model.php index 9dfaf13c1c..6c50b2b5dc 100644 --- a/module/risk/model.php +++ b/module/risk/model.php @@ -117,7 +117,7 @@ class riskModel extends model */ public function getList($browseType = '', $param = '', $orderBy = 'id_desc', $pager = null) { - if($browseType == 'bySearch') return $this->getBySearch($param, $orderBy, $pager); + if($browseType == 'bysearch') return $this->getBySearch($param, $orderBy, $pager); return $this->dao->select('*')->from(TABLE_RISK) ->where('deleted')->eq(0)