refactor(测试计划): 优化权限&取消模块下计划名称唯一限制

metersphere · May 11, 2024 · 1c1d52f · 1c1d52f
1 parent 9aad091
commit 1c1d52f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 17 deletions.
diff --git a/...t-plan/src/main/java/io/metersphere/plan/controller/TestPlanFunctionalCaseController.java b/...t-plan/src/main/java/io/metersphere/plan/controller/TestPlanFunctionalCaseController.java
@@ -63,7 +63,7 @@ public TestPlanResourceSortResponse sortNode(@Validated @RequestBody ResourceSor
 
     @PostMapping("/page")
     @Operation(summary = "测试计划-已关联功能用例分页查询")
-    @RequiresPermissions(PermissionConstants.FUNCTIONAL_CASE_READ)
+    @RequiresPermissions(PermissionConstants.TEST_PLAN_READ)
     @CheckOwner(resourceId = "#request.getTestPlanId()", resourceType = "test_plan")
     public Pager<List<TestPlanCasePageResponse>> page(@Validated @RequestBody TestPlanCaseRequest request) {
         Page<Object> page = PageHelper.startPage(request.getCurrent(), request.getPageSize());
@@ -73,15 +73,15 @@ public Pager<List<TestPlanCasePageResponse>> page(@Validated @RequestBody TestPl
 
     @GetMapping("/tree/{testPlanId}")
     @Operation(summary = "测试计划-已关联功能用例列表模块树")
-    @RequiresPermissions(PermissionConstants.CASE_REVIEW_READ)
+    @RequiresPermissions(PermissionConstants.TEST_PLAN_READ)
     @CheckOwner(resourceId = "#testPlanId", resourceType = "test_plan")
     public List<BaseTreeNode> getTree(@PathVariable String testPlanId) {
         return testPlanFunctionalCaseService.getTree(testPlanId);
     }
 
     @PostMapping("/module/count")
     @Operation(summary = "测试计划-已关联功能用例模块数量")
-    @RequiresPermissions(PermissionConstants.CASE_REVIEW_READ)
+    @RequiresPermissions(PermissionConstants.TEST_PLAN_READ)
     @CheckOwner(resourceId = "#request.getTestPlanId()", resourceType = "test_plan")
     public Map<String, Long> moduleCount(@Validated @RequestBody TestPlanCaseRequest request) {
         return testPlanFunctionalCaseService.moduleCount(request);

diff --git a/...ervices/test-plan/src/main/java/io/metersphere/plan/service/TestPlanBaseUtilsService.java b/...ervices/test-plan/src/main/java/io/metersphere/plan/service/TestPlanBaseUtilsService.java
@@ -39,20 +39,6 @@ public void validateTestPlan(TestPlan testPlan) {
             TestPlan group = testPlanMapper.selectByPrimaryKey(testPlan.getGroupId());
             testPlan.setModuleId(group.getModuleId());
         }
-        TestPlanExample example = new TestPlanExample();
-        if (StringUtils.isBlank(testPlan.getId())) {
-            //新建 校验
-            example.createCriteria().andNameEqualTo(testPlan.getName()).andProjectIdEqualTo(testPlan.getProjectId()).andModuleIdEqualTo(testPlan.getModuleId());
-            if (testPlanMapper.countByExample(example) > 0) {
-                throw new MSException(Translator.get("test_plan.name.exist") + ":" + testPlan.getName());
-            }
-        } else {
-            //更新 校验
-            example.createCriteria().andNameEqualTo(testPlan.getName()).andProjectIdEqualTo(testPlan.getProjectId()).andIdNotEqualTo(testPlan.getId()).andModuleIdEqualTo(testPlan.getModuleId());
-            if (testPlanMapper.countByExample(example) > 0) {
-                throw new MSException(Translator.get("test_plan.name.exist") + ":" + testPlan.getName());
-            }
-        }
     }