Merge branch 'develop3.0-tmd' into develop3.0

TEAMModelOS/ClientApp/src/components/evaluation/ExerciseList.vue

@@ -84,7 +84,7 @@
 					<span class="item-tools-info">难度：{{ exersicesDiff[item.level - 1] }}</span>
 					<span class="item-tools-info">认知层次：{{ exersicesField[item.field - 1] }}</span>
 					<span class="item-tools-info">使用次数：{{ item.usageCount || 0 }} 次</span>
-					<span class="item-tools-info">更新时间：{{ $tools.formatTime(item.createTime)  || 0 }} </span>
+					<span class="item-tools-info" v-if="item.createTime">更新时间：{{ $tools.formatTime(item.createTime)  || 0 }} </span>
 					<Button type="info" v-if="!isAnalysis" :style="{backgroundColor:selectList.map(i => i.id).indexOf(item.id) > -1 ? '#bbbbbb' : '#2db7f5'}"
 					 @click.stop="onSelectItem(item,index)">{{ selectList.map(i => i.id).indexOf(item.id) > -1 ? '移除' : '选题'}}</Button>
 				</div>

TEAMModelOS/Controllers/Common/ExamController.cs

@@ -951,7 +951,7 @@ namespace TEAMModelOS.Controllers
                 }
                 else {
                     string ssr = resultIds.Count > 0 ? resultIds[0] : "";
-                    strs.Add(ssr);
+                    strs.Add($"array_contains(c.targetClassIds,'{ssr}')");
                     //builder.Append($" array_contains(c.targetClassIds,'{ssr}')");
                 }
                 string ss = string.Join(" or ", strs);