Merge branch 'feat-dingwf-mvp616' into develop

project-order/src/main/java/com/alibaba/cloud/integration/order/controller/OrganizationController.java

@@ -3,6 +3,7 @@ package com.alibaba.cloud.integration.order.controller;
 import com.alibaba.cloud.integration.common.BusinessException;
 import com.alibaba.cloud.integration.common.BusinessException;
 import com.alibaba.cloud.integration.common.Result;
 import com.alibaba.cloud.integration.common.Result;
 import com.alibaba.cloud.integration.order.dto.LevelReqDTO;
 import com.alibaba.cloud.integration.order.dto.LevelReqDTO;
+import com.alibaba.cloud.integration.order.dto.OrganizationEngineersReqDTO;
 import com.alibaba.cloud.integration.order.service.OrganizationService;
 import com.alibaba.cloud.integration.order.service.OrganizationService;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -42,10 +43,10 @@ public class OrganizationController {
     }
     }
 
 
     @GetMapping("/organization/engineer/list")
     @GetMapping("/organization/engineer/list")
-    public Result<?> getTeamsEngineers(@RequestParam String[] teamIds) {
+    public Result<?> getTeamsEngineers(OrganizationEngineersReqDTO reqDTO) {
         Result<?> res = null;
         Result<?> res = null;
         try {
         try {
-            res = organizationService.getEngineersByTeams(teamIds);
+            res = organizationService.getEngineersByTeams(reqDTO.getTeamIds());
         } catch (BusinessException e) {
         } catch (BusinessException e) {
             return Result.failed(e.getMessage());
             return Result.failed(e.getMessage());
         }
         }

project-order/src/main/java/com/alibaba/cloud/integration/order/dto/OrganizationEngineersReqDTO.java

+package com.alibaba.cloud.integration.order.dto;
+
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+@lombok.Data
+public class OrganizationEngineersReqDTO {
+    private List<String> teamIds;
+}
+

project-order/src/main/java/com/alibaba/cloud/integration/order/service/OrganizationService.java

@@ -2,10 +2,12 @@ package com.alibaba.cloud.integration.order.service;
 
 
 import com.alibaba.cloud.integration.common.Result;
 import com.alibaba.cloud.integration.common.Result;
 
 
+import java.util.List;
+
 public interface OrganizationService {
 public interface OrganizationService {
     Result<?> getOrganizationTree(String levelType, String levelId);
     Result<?> getOrganizationTree(String levelType, String levelId);
 
 
-    Result<?> getEngineersByTeams(String[] teamIds);
+    Result<?> getEngineersByTeams(List<String> teamIds);
 
 
     Result<?> getTeamsByLevel(String levelType, String levelValue);
     Result<?> getTeamsByLevel(String levelType, String levelValue);
 }
 }

project-order/src/main/java/com/alibaba/cloud/integration/order/service/impl/OrganizationServiceImpl.java

@@ -75,9 +75,9 @@ public class OrganizationServiceImpl implements OrganizationService {
     }
     }
 
 
     @Override
     @Override
-    public Result<?> getEngineersByTeams(String[] teamIds) {
+    public Result<?> getEngineersByTeams(List<String> teamIds) {
         List<OrganizationEngineersRespDTO.Engineer> engineers = new ArrayList<>();
         List<OrganizationEngineersRespDTO.Engineer> engineers = new ArrayList<>();
-        for (OrgTeamEngineerEntity e : orgTeamEngineerDao.findAllByTeamIdIn(Arrays.asList(teamIds))) {
+        for (OrgTeamEngineerEntity e : orgTeamEngineerDao.findAllByTeamIdIn(teamIds)) {
             EngineerInfoEntity engineerInfoEntity = engineerInfoDao.getByEngineerCode(e.getEngineerCode());
             EngineerInfoEntity engineerInfoEntity = engineerInfoDao.getByEngineerCode(e.getEngineerCode());
             if (engineerInfoEntity == null) {
             if (engineerInfoEntity == null) {
                 log.error("技术员信息不存在！engineer_code: {}", e.getEngineerCode());
                 log.error("技术员信息不存在！engineer_code: {}", e.getEngineerCode());
@@ -90,6 +90,7 @@ public class OrganizationServiceImpl implements OrganizationService {
 
 
     @Override
     @Override
     public Result<?> getTeamsByLevel(String levelType, String levelValue) {
     public Result<?> getTeamsByLevel(String levelType, String levelValue) {
+        log.debug("getTeamsByLevel({}, {})", levelType, levelValue);
         List<OrgTeamEntity> entities;
         List<OrgTeamEntity> entities;
         if ("cluster".equals(levelType)) {
         if ("cluster".equals(levelType)) {
             entities = orgTeamDao.findAllByClusterId(levelValue);
             entities = orgTeamDao.findAllByClusterId(levelValue);