refactor(项目设置): 优化系统自带环境带脚本时的通知

metersphere · May 29, 2023 · d5e9d3d · d5e9d3d
1 parent f33f28a
commit d5e9d3d
Showing 1 changed file with 27 additions and 14 deletions.
diff --git a/backend/src/main/java/io/metersphere/api/service/ApiTestEnvironmentService.java b/backend/src/main/java/io/metersphere/api/service/ApiTestEnvironmentService.java
@@ -171,20 +171,33 @@ public void update(ApiTestEnvironmentDTO apiTestEnvironment, List<MultipartFile>
         apiTestEnvironmentMapper.updateByPrimaryKeyWithBLOBs(apiTestEnvironment);
 
         if (StringUtils.isBlank(apiTestEnvironment.getCreateUser())){
-            UserGroupExample userGroupExample = new UserGroupExample();
-            userGroupExample.createCriteria().andSourceIdEqualTo(apiTestEnvironment.getProjectId()).andGroupIdEqualTo("project_admin");
-            List<UserGroup> userGroups = userGroupMapper.selectByExample(userGroupExample);
-            if (CollectionUtils.isNotEmpty(userGroups)){
-                userGroups.forEach(userGroup -> {
-                    checkAndSendReviewMessage(apiTestEnvironment.getId(),
-                            apiTestEnvironment.getName(),
-                            apiTestEnvironment.getProjectId(),
-                            NoticeConstants.TaskType.ENV_TASK,
-                            envOrg.getConfig(),
-                            apiTestEnvironment.getConfig(),
-                            userGroup.getUserId()
-                    );
-                });
+            ProjectApplication reviewer = projectApplicationService
+                    .getProjectApplication(apiTestEnvironment.getProjectId(), ProjectApplicationType.API_SCRIPT_REVIEWER.name());
+            if (StringUtils.isNotBlank(reviewer.getTypeValue())) {
+                checkAndSendReviewMessage(apiTestEnvironment.getId(),
+                        apiTestEnvironment.getName(),
+                        apiTestEnvironment.getProjectId(),
+                        NoticeConstants.TaskType.ENV_TASK,
+                        envOrg.getConfig(),
+                        apiTestEnvironment.getConfig(),
+                        reviewer.getTypeValue()
+                );
+            } else {
+                UserGroupExample example = new UserGroupExample();
+                example.createCriteria().andSourceIdEqualTo(apiTestEnvironment.getProjectId()).andGroupIdEqualTo("project_admin");
+                List<UserGroup> userGroups = userGroupMapper.selectByExample(example);
+                if ( CollectionUtils.isNotEmpty(userGroups)) {
+                    userGroups.forEach(userGroup -> {
+                        checkAndSendReviewMessage(apiTestEnvironment.getId(),
+                                apiTestEnvironment.getName(),
+                                apiTestEnvironment.getProjectId(),
+                                NoticeConstants.TaskType.ENV_TASK,
+                                envOrg.getConfig(),
+                                apiTestEnvironment.getConfig(),
+                                userGroup.getUserId()
+                        );
+                    });
+                }
             }
         } else {
             checkAndSendReviewMessage(apiTestEnvironment.getId(),