Merge branch ztflow-sunguangming-dev/bug-63245#sunguangming of zentao/zentaopms (#9484)

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();

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;