test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/v2.9' into v2.9 

# Conflicts:
#	test-track/backend/src/main/java/io/metersphere/plan/service/TestPlanService.java
#	workstation/frontend/src/business/component/CaseTableList.vue
This commit is contained in:
liqiang-fit2cloud 2023-04-28 18:10:43 +08:00
parent 3aab3accc8 a3955ef5e3
commit e001cf47af
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test-track/backend/src/main/java/io/metersphere/plan/service/TestPlanService.java
View File

@ -674,6 +674,7 @@ public class TestPlanService {
caseTestRelevance(request, subList); caseTestRelevance(request, subList);
}); });
} catch (Exception e) { } catch (Exception e) {
sqlSession.rollback();
throw new RuntimeException(e); throw new RuntimeException(e);
} finally { } finally {
if (sqlSession != null && sqlSessionFactory != null) { if (sqlSession != null && sqlSessionFactory != null) {

2
workstation/frontend/src/business/component/CaseTableList.vue
View File

@ -448,7 +448,7 @@ export default {
if (this.condition.filters) { if (this.condition.filters) {
this.condition.filters.review_status = ["Prepare", "Underway", "Pass", "UnPass"]; this.condition.filters.review_status = ["Prepare", "Underway", "Pass", "UnPass"];
} else { } else {
this.condition.filters = { review_status: ["Prepare", "Underway", "Pass", "UnPass"] }; this.condition.filters = { review_status: ["Prepare", "Underway", "Pass", "UnPass"]};
} }
let ids = this.$route.params.ids; let ids = this.$route.params.ids;
if (ids) { if (ids) {