Merge branch dev/bug-65634 of zentao/zentaopms (#11579)

module/transfer/model.php

@@ -642,7 +642,14 @@ class transferModel extends model
         /* If export spec or verify field, append. */
         if(isset($fieldList['spec']) || isset($fieldList['verify']))
         {
-            $editorDataList = $this->dao->select('story,spec,verify')->from(TABLE_STORYSPEC)->where('story')->in(array_keys($moduleDatas))->fetchAll('story');
+            if($module == 'demand')
+            {
+                $editorDataList = $this->dao->select('demand,spec,verify')->from(TABLE_DEMANDSPEC)->where('demand')->in(array_keys($moduleDatas))->fetchAll('demand');
+            }
+            else
+            {
+                $editorDataList = $this->dao->select('story,spec,verify')->from(TABLE_STORYSPEC)->where('story')->in(array_keys($moduleDatas))->fetchAll('story');
+            }
             foreach($moduleDatas as $moduleData)
             {
                 if(isset($fieldList['spec'])) $moduleData->spec = !empty($editorDataList[$moduleData->id]) ? $editorDataList[$moduleData->id]->spec : $editorDataList[$moduleData->id]->spec;

module/transfer/test/model/getrows.php

@@ -26,6 +26,8 @@ cid=1
 - 测试导出多人串行任务第1条的name属性 @[多人] 开发任务12
 - 测试导出正常任务第2条的name属性 @开发任务13
 - 测试导出子任务第3条的name属性 @开发任务14
+- 测试导出附件是否存在 @1
+- 测试当有数据需要单独处理时第1条的name属性 @[多人] 追加任务1
 
 */
 $transfer = new transferTest();