diff --git a/module/action/model.php b/module/action/model.php index d6c51e6ccd..dfc768d9a5 100755 --- a/module/action/model.php +++ b/module/action/model.php @@ -470,6 +470,13 @@ class actionModel extends model ->where('t1.id')->in($objectIdList) ->fetchPairs(); } + elseif($objectType == 'stakeholder') + { + $objectNames[$objectType] = $this->dao->select("t1.id, t2.realname AS name")->from($table)->alias('t1') + ->leftJoin(TABLE_USER)->alias('t2')->on('t1.user = t2.account') + ->where('t1.id')->in($objectIdList) + ->fetchPairs(); + } else { $objectNames[$objectType] = $this->dao->select("id, {$field} AS name")->from($table)->where('id')->in($objectIdList)->filterTpl('skip')->fetchPairs(); diff --git a/module/testcase/tao.php b/module/testcase/tao.php index 040821c83c..ca46cf940a 100644 --- a/module/testcase/tao.php +++ b/module/testcase/tao.php @@ -268,8 +268,8 @@ class testcaseTao extends testcaseModel $data->name = str_replace('.0', '', $name); $data->id = $step->id; $data->step = $step->desc; - $data->desc = $step->desc; - $data->expect = $step->expect; + $data->desc = html_entity_decode($step->desc); + $data->expect = html_entity_decode($step->expect); $data->type = $step->type; $data->parent = $step->parent; $data->grade = $grade;