diff --git a/dq-financial-api/src/main/java/com/daqing/financial/crms/CustomerControllerApi.java b/dq-financial-api/src/main/java/com/daqing/financial/crms/CustomerControllerApi.java
index 0612b05b..685de46e 100644
--- a/dq-financial-api/src/main/java/com/daqing/financial/crms/CustomerControllerApi.java
+++ b/dq-financial-api/src/main/java/com/daqing/financial/crms/CustomerControllerApi.java
@@ -68,7 +68,7 @@ public interface CustomerControllerApi {
      * 导入excel数据
      */
     @ApiOperation(value = "导入excel数据", notes = "导入excel数据")
-    void excelImportCustomer(MultipartFile file);
+    ResponseResult excelImportCustomer(MultipartFile file);
 
     /**
      * 导出数据到excel
diff --git a/dq-financial-api/src/main/java/com/daqing/financial/hrms/EmployeeControllerApi.java b/dq-financial-api/src/main/java/com/daqing/financial/hrms/EmployeeControllerApi.java
index 97c662f8..4751f69b 100644
--- a/dq-financial-api/src/main/java/com/daqing/financial/hrms/EmployeeControllerApi.java
+++ b/dq-financial-api/src/main/java/com/daqing/financial/hrms/EmployeeControllerApi.java
@@ -26,4 +26,7 @@ public interface EmployeeControllerApi {
 
     @ApiOperation(value = "根据id删除员工信息", notes = "根据id删除员工信息")
     ResponseResult delete(Long[] ids);
+
+    @ApiOperation(value = "查询所有员工id和姓名",notes = "查询所有员工id和姓名")
+    ResponseResult listEmployeeName();
 }
diff --git a/dq-financial-api/target/classes/com/daqing/financial/crms/CustomerControllerApi.class b/dq-financial-api/target/classes/com/daqing/financial/crms/CustomerControllerApi.class
index dbc11e5a..8ba8864b 100644
Binary files a/dq-financial-api/target/classes/com/daqing/financial/crms/CustomerControllerApi.class and b/dq-financial-api/target/classes/com/daqing/financial/crms/CustomerControllerApi.class differ
diff --git a/dq-financial-api/target/classes/com/daqing/financial/hrms/DeptControllerApi.class b/dq-financial-api/target/classes/com/daqing/financial/hrms/DeptControllerApi.class
index 5be81c78..5ab93650 100644
Binary files a/dq-financial-api/target/classes/com/daqing/financial/hrms/DeptControllerApi.class and b/dq-financial-api/target/classes/com/daqing/financial/hrms/DeptControllerApi.class differ
diff --git a/dq-financial-api/target/classes/com/daqing/financial/hrms/EmployeeControllerApi.class b/dq-financial-api/target/classes/com/daqing/financial/hrms/EmployeeControllerApi.class
index 07ce468b..e6b3b9e4 100644
Binary files a/dq-financial-api/target/classes/com/daqing/financial/hrms/EmployeeControllerApi.class and b/dq-financial-api/target/classes/com/daqing/financial/hrms/EmployeeControllerApi.class differ
diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CustomerController.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CustomerController.java
index b5d664e1..b6b75c61 100644
--- a/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CustomerController.java
+++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CustomerController.java
@@ -141,8 +141,9 @@ public class CustomerController implements CustomerControllerApi {
      * 导入excel数据
      */
     @PostMapping("/excelImport")
-    public void excelImportCustomer(MultipartFile file){
+    public ResponseResult excelImportCustomer(MultipartFile file){
 
-        customerService.excelImportCustomer(file);
+        boolean result = customerService.excelImportCustomer(file);
+        return result ? ResponseResult.SUCCESS() : new ResponseResult(CommonCode.IMPORT_ERROR);
     }
 }
diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/CustomerService.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/CustomerService.java
index a5ac912d..cfbcd4d5 100644
--- a/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/CustomerService.java
+++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/CustomerService.java
@@ -39,7 +39,7 @@ public interface CustomerService extends IService<CustomerEntity> {
 
     void excelExportCustomer(HttpServletResponse response);
 
-    void excelImportCustomer(MultipartFile excel);
+    boolean excelImportCustomer(MultipartFile excel);
 
     void excelTemplate(HttpServletResponse response);
 }
diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerServiceImpl.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerServiceImpl.java
index 8220f2e7..37bfb53a 100644
--- a/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerServiceImpl.java
+++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerServiceImpl.java
@@ -276,8 +276,11 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerDao, CustomerEntity
      */
     @Transactional
     @Override
-    public void excelImportCustomer(MultipartFile excel) {
+    public boolean excelImportCustomer(MultipartFile excel) {
         //TODO 导入excel数据到数据库,思路耗时太长,有待优化
+        if (excel == null){
+            ExceptionCast.cast(CrmsCode.NOT_NULL);
+        }
         try {
             List<Object> personalList = ExcelUtil.readExcel(excel, new CustomerPersonalVO(), 1);
             List<Object> companyList = ExcelUtil.readExcel(excel, new CustomerCompanyVO(), 2);
@@ -318,8 +321,10 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerDao, CustomerEntity
                 }
                 this.saveCustomerCompany(customer,cc);
             }
+            return true;
         }catch (Exception e){
             ExceptionCast.cast(CrmsCode.CUSTOMER_IMPORT_EXSIT);
+            return false;
         }
     }
 
diff --git a/dq-financial-crms/target/classes/com/daqing/financial/crms/controller/CustomerController.class b/dq-financial-crms/target/classes/com/daqing/financial/crms/controller/CustomerController.class
index 8ea5279a..d58c2bf4 100644
Binary files a/dq-financial-crms/target/classes/com/daqing/financial/crms/controller/CustomerController.class and b/dq-financial-crms/target/classes/com/daqing/financial/crms/controller/CustomerController.class differ
diff --git a/dq-financial-crms/target/classes/com/daqing/financial/crms/service/CustomerService.class b/dq-financial-crms/target/classes/com/daqing/financial/crms/service/CustomerService.class
index f7c2de0c..35b86f13 100644
Binary files a/dq-financial-crms/target/classes/com/daqing/financial/crms/service/CustomerService.class and b/dq-financial-crms/target/classes/com/daqing/financial/crms/service/CustomerService.class differ
diff --git a/dq-financial-crms/target/classes/com/daqing/financial/crms/service/impl/CustomerServiceImpl.class b/dq-financial-crms/target/classes/com/daqing/financial/crms/service/impl/CustomerServiceImpl.class
index e9a3f040..547b83fb 100644
Binary files a/dq-financial-crms/target/classes/com/daqing/financial/crms/service/impl/CustomerServiceImpl.class and b/dq-financial-crms/target/classes/com/daqing/financial/crms/service/impl/CustomerServiceImpl.class differ
diff --git a/dq-financial-crms/target/test-classes/com/daqing/financial/crms/DqFinancialCrmsApplicationTests.class b/dq-financial-crms/target/test-classes/com/daqing/financial/crms/DqFinancialCrmsApplicationTests.class
deleted file mode 100644
index 9e78cf07..00000000
Binary files a/dq-financial-crms/target/test-classes/com/daqing/financial/crms/DqFinancialCrmsApplicationTests.class and /dev/null differ
diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/controller/DeptController.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/controller/DeptController.class
index 038c5072..c572fc72 100644
Binary files a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/controller/DeptController.class and b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/controller/DeptController.class differ
diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/controller/EmployeeController.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/controller/EmployeeController.class
index c6234214..528d4b0a 100644
Binary files a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/controller/EmployeeController.class and b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/controller/EmployeeController.class differ
diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/controller/PermissionController.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/controller/PermissionController.class
index 4a403370..7c82a023 100644
Binary files a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/controller/PermissionController.class and b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/controller/PermissionController.class differ
diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/controller/PositionController.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/controller/PositionController.class
index 30a13490..ba3901d6 100644
Binary files a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/controller/PositionController.class and b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/controller/PositionController.class differ
diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/controller/UserController.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/controller/UserController.class
index 83fb4a9d..949f0700 100644
Binary files a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/controller/UserController.class and b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/controller/UserController.class differ
diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/dao/DeptDao.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/dao/DeptDao.class
index e4f9f56e..c21f0674 100644
Binary files a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/dao/DeptDao.class and b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/dao/DeptDao.class differ
diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/DeptService.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/DeptService.class
index 08bd98ce..dd60d559 100644
Binary files a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/DeptService.class and b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/DeptService.class differ
diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/impl/DeptServiceImpl.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/impl/DeptServiceImpl.class
index 77de5a98..f08fbac9 100644
Binary files a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/impl/DeptServiceImpl.class and b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/impl/DeptServiceImpl.class differ
diff --git a/dq-financial-hrms/target/classes/mapper/hrms/DeptDao.xml b/dq-financial-hrms/target/classes/mapper/hrms/DeptDao.xml
index 294e0608..8ffcc49b 100644
--- a/dq-financial-hrms/target/classes/mapper/hrms/DeptDao.xml
+++ b/dq-financial-hrms/target/classes/mapper/hrms/DeptDao.xml
@@ -36,4 +36,9 @@
         FROM hrms_dept
     </select>
 
+    <select id="getDepartmentByParentId" parameterType="long" resultType="com.daqing.framework.domain.hrms.DepartmentVO">
+        SELECT id,name,parent_id,sort
+        FROM hrms_dept WHERE parent_id = #{parentId}
+    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/dq-financial-hrms/target/test-classes/com/daqing/financial/hrms/DqFinancialHrmsApplicationTests.class b/dq-financial-hrms/target/test-classes/com/daqing/financial/hrms/DqFinancialHrmsApplicationTests.class
deleted file mode 100644
index aab19442..00000000
Binary files a/dq-financial-hrms/target/test-classes/com/daqing/financial/hrms/DqFinancialHrmsApplicationTests.class and /dev/null differ
diff --git a/dq-framework-common/src/main/java/com/daqing/framework/model/response/CommonCode.java b/dq-framework-common/src/main/java/com/daqing/framework/model/response/CommonCode.java
index 6c930972..2e71ad4c 100644
--- a/dq-framework-common/src/main/java/com/daqing/framework/model/response/CommonCode.java
+++ b/dq-framework-common/src/main/java/com/daqing/framework/model/response/CommonCode.java
@@ -25,6 +25,7 @@ public enum CommonCode implements ResultCode {
     INVALID_PARAM(false, 10003, "非法参数！"),
     USER_IS_NOT_EXIST(false, 10004, "用户不存在或用户已禁用！"),
     PASSWORD_IS_ERROR(false, 10005, "密码错误！"),
+    IMPORT_ERROR(false,10008,"导入数据失败!"),
     SERVER_ERROR(false, 99999, "抱歉，系统繁忙，请稍后重试！");
 
     /**
diff --git a/dq-framework-common/target/classes/com/daqing/framework/model/response/CommonCode.class b/dq-framework-common/target/classes/com/daqing/framework/model/response/CommonCode.class
index a15c2503..d939627d 100644
Binary files a/dq-framework-common/target/classes/com/daqing/framework/model/response/CommonCode.class and b/dq-framework-common/target/classes/com/daqing/framework/model/response/CommonCode.class differ
diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/response/CrmsCode.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/response/CrmsCode.java
index 6f150867..c4e8e7fb 100644
--- a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/response/CrmsCode.java
+++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/response/CrmsCode.java
@@ -17,7 +17,8 @@ public enum CrmsCode implements ResultCode {
 
     CUSTOMER_IMPORT_EXSIT(false,20001,"导入数据失败,请检查文件和数据格式或稍后再试!"),
     CUSTOMER_EXPORT_EXSIT(false,20002,"导出数据失败,请稍后再试!"),
-    CUSTOMER_EXPORTTEMPLATE_EXSIT(false,20003,"导出excel模板失败,请稍后再试!");
+    CUSTOMER_EXPORTTEMPLATE_EXSIT(false,20003,"导出excel模板失败,请稍后再试!"),
+    NOT_NULL(false,20004,"上传的文件不能为空");
 
     /**
      * 操作是否成功
diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/CompanyCustomerEntity.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/CompanyCustomerEntity.class
index 7a688170..38424ed8 100644
Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/CompanyCustomerEntity.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/CompanyCustomerEntity.class differ
diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/CustomerEntity.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/CustomerEntity.class
index 3dfe10d5..8eff526a 100644
Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/CustomerEntity.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/CustomerEntity.class differ
diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/PersonalCustomerEntity.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/PersonalCustomerEntity.class
index adc9c109..ba4648c3 100644
Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/PersonalCustomerEntity.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/PersonalCustomerEntity.class differ
diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerCompanyTO.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerCompanyTO.class
index bc268638..4d6d7b5f 100644
Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerCompanyTO.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerCompanyTO.class differ
diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerCompanyVO.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerCompanyVO.class
index e1bf1bad..93855781 100644
Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerCompanyVO.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerCompanyVO.class differ
diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerPersonalTO.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerPersonalTO.class
index de936ba3..c0448edd 100644
Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerPersonalTO.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerPersonalTO.class differ
diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerTO.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerTO.class
index db53adb8..c4e917ca 100644
Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerTO.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerTO.class differ
diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/request/CustomerRequest.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/request/CustomerRequest.class
index 6d892785..ee3f5621 100644
Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/request/CustomerRequest.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/request/CustomerRequest.class differ
diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/response/CrmsCode.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/response/CrmsCode.class
index b35c4610..8780f9f8 100644
Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/response/CrmsCode.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/response/CrmsCode.class differ
diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/DepartmentVO.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/DepartmentVO.class
index a3424160..1fd6cc33 100644
Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/DepartmentVO.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/DepartmentVO.class differ
diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/DeptEntity.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/DeptEntity.class
index 652a3e21..9d87ab00 100644
Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/DeptEntity.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/DeptEntity.class differ
diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/response/HrmsCode.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/response/HrmsCode.class
index 234a8310..c9ecf877 100644
Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/response/HrmsCode.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/response/HrmsCode.class differ