lxb 1 gadu atpakaļ
vecāks
revīzija
b46966c2c2

+ 5 - 7
imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/operationManagementCenter/service/impl/ToolTaskNodeServiceImpl.java

@@ -142,6 +142,7 @@ public class ToolTaskNodeServiceImpl extends SuperServiceImpl<ToolTaskNodeMapper
 
             List<Long> centralToolIdList = applyChangeToolDetailDto.getCentralToolIdList();
             List<Long> resourceToolIdList = applyChangeToolDetailDto.getResourceToolIdList();
+            List<ToolStorge> storgeIdList = applyChangeToolDetailDto.getStorgeId();
             List<String> centralToolTypeList = applyChangeToolDetailDto.getCentralToolTypeList();
             Long resourceId = applyChangeToolDetailDto.getResourceId();
 
@@ -167,13 +168,10 @@ public class ToolTaskNodeServiceImpl extends SuperServiceImpl<ToolTaskNodeMapper
                     TaskNodeTool taskNodeTool = new TaskNodeTool();
                     taskNodeTool.setId(snowflake.nextId())
                                     .setCentralToolType(centralToolType);
-                    if(resourceToolIdList.size() >= i){
-                        Long resourceToolId = resourceToolIdList.get(i);
-                        Map<String,Object> params = new HashMap<>();
-                        params.put("toolId",resourceToolId);
-                        List<ToolStorge> storge = toolStorgeService.getStorge(params);
-                        taskNodeTool.setToolStorgeId(storge.get(0).getId());
-                        taskNodeTool.setResourceToolId(resourceToolId);
+                    if(CollectionUtil.isNotEmpty(storgeIdList) && storgeIdList.size() >= i){
+                        ToolStorge toolStorge = storgeIdList.get(i);
+                        taskNodeTool.setToolStorgeId(toolStorge.getId());
+                        taskNodeTool.setResourceToolId(toolStorge.getToolId());
                     }
                     taskNodeToolList.add(taskNodeTool);
                 }