From 2e68db40a93b1fb942fb6d225a5f4ecce29dff67 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 26 Apr 2023 17:09:59 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E9=97=A8=E5=AF=BC=E5=85=A5=EF=BC=8C?=
 =?UTF-8?q?=E5=BE=AE=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/controller/DepartmentController.java | 2 +-
 .../java/com/epmet/service/impl/DepartmentServiceImpl.java   | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/DepartmentController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/DepartmentController.java
index 5706b5b70a..e3b75943d7 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/DepartmentController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/DepartmentController.java
@@ -235,7 +235,7 @@ public class DepartmentController implements ResultDataResolver {
         response.setHeader(HttpHeaders.CONTENT_TYPE, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
         response.setHeader(HttpHeaders.CONTENT_DISPOSITION, "attachment;filename=" + URLEncoder.encode("部门导入模版", "UTF-8") + ".xlsx");
 
-        InputStream is = this.getClass().getClassLoader().getResourceAsStream("excel/yantai/yantai_dept_import_tem.xlsx.xlsx");
+        InputStream is = this.getClass().getClassLoader().getResourceAsStream("excel/yantai/yantai_dept_import_tem.xlsx");
         try {
             ServletOutputStream os = response.getOutputStream();
             IOUtils.copy(is, os);
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java
index fe5e320a13..4dc1a40c2c 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java
@@ -573,8 +573,11 @@ public class DepartmentServiceImpl implements DepartmentService {
     @Async
     @Override
     public void execAsyncExcelImport(Path filePath, String importTaskId,String agencyId,String originalFilename) {
+        CustomerAgencyEntity agencyEntity = customerAgencyDao.selectById(agencyId);
+        if (null == agencyEntity) {
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "组织不存在，agencyId" + agencyId, "只有组织才可以导入部门");
+        }
         try {
-            CustomerAgencyEntity agencyEntity=customerAgencyDao.selectById(agencyId);
             DeptExcelImportListener listener = new DeptExcelImportListener(EpmetRequestHolder.getLoginUserCustomerId(),
                     EpmetRequestHolder.getLoginUserId(),
                     agencyEntity,