fix

virgo.api/src/main/java/com/bosshand/virgo/api/operate/controller/OperateDeviceController.java

@@ -138,18 +138,21 @@ public class OperateDeviceController {
     @GetMapping("/export/{projectId}/{godownId}")
     public void export(HttpServletResponse response, @PathVariable long projectId, @PathVariable long godownId) {
         Project project = projectService.getProject(projectId);
-        Godown godown = godownService.getGodown(godownId);
+        String name = "";
+        if (godownId != 0) {
+            name = godownService.getGodown(godownId).getName() + "-";
+        }
         List<OperateDeviceExportDto> list = new ArrayList<>();
         OperateDevice operateDevice = new OperateDevice();
         operateDevice.setProjectId(projectId);
         operateDevice.setGodownId(godownId);
         List<OperateDevice> dataList = operateDeviceService.getExport(operateDevice);
-        for(OperateDevice o : dataList){
+        for (OperateDevice o : dataList) {
             OperateDeviceExportDto dto = new OperateDeviceExportDto();
             BeanUtils.copyProperties(o, dto);
             list.add(dto);
         }
-        ExcelUtils.export(response, project.getName()+"-"+godown.getName()+"-"+"资产表", list, OperateDeviceExportDto.class);
+        ExcelUtils.export(response, project.getName() + "-" + name + "资产表", list, OperateDeviceExportDto.class);
     }
 
     /**
@@ -159,7 +162,10 @@ public class OperateDeviceController {
     @RequestMapping(value = "/exportStocktaking/{projectId}/{godownId}", method = RequestMethod.GET)
     public void exportStocktaking(HttpServletResponse response, @PathVariable long projectId, @PathVariable long godownId) {
         Project project = projectService.getProject(projectId);
-        Godown godown = godownService.getGodown(godownId);
+        String name = "";
+        if (godownId != 0) {
+            name = godownService.getGodown(godownId).getName() + "-";
+        }
         List<OperateDeviceStocktakingDto> list = new ArrayList<>();
         OperateDevice operateDevice = new OperateDevice();
         operateDevice.setProjectId(projectId);
@@ -170,7 +176,7 @@ public class OperateDeviceController {
             BeanUtils.copyProperties(o, dto);
             list.add(dto);
         }
-        ExcelUtils.export(response, project.getName()+"-"+godown.getName()+"-"+"资产盘点表", list, OperateDeviceStocktakingDto.class);
+        ExcelUtils.export(response, project.getName()+"-" + name +"资产盘点表", list, OperateDeviceStocktakingDto.class);
     }