diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java
index af68e94c..0f81098f 100644
--- a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java
+++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java
@@ -421,30 +421,32 @@ public class SysDepartController {
 				List<String> errorMessage = new ArrayList<>();
                 int num = 0;
                 for (SysDepartExcel sysDepart : listSysDeparts) {
-                	String orgCode = sysDepart.getOrgCode();
-                	if(orgCode.length() > codeLength) {
-                		String parentCode = orgCode.substring(0, orgCode.length()-codeLength);
-                		QueryWrapper<SysDepart> queryWrapper = new QueryWrapper<SysDepart>();
-                		queryWrapper.eq("org_code", parentCode);
-                		SysDepart parentDept = sysDepartService.getOne(queryWrapper);
-                		if(parentDept != null) {
-							sysDepart.setParentId(parentDept.getId());
-						} else {
+					int lineNumber = num +1;
+					List<String> errorList = ValidUtil.validateReturnList(sysDepart);
+					if (!errorList.isEmpty()){
+						errorMessage.add("第 " + lineNumber + " 行："+ StringUtils.join(errorList,"，"));
+					}
+					if (errorMessage.isEmpty()){
+						String orgCode = sysDepart.getOrgCode();
+						if(orgCode.length() > codeLength) {
+							String parentCode = orgCode.substring(0, orgCode.length()-codeLength);
+							QueryWrapper<SysDepart> queryWrapper = new QueryWrapper<SysDepart>();
+							queryWrapper.eq("org_code", parentCode);
+							SysDepart parentDept = sysDepartService.getOne(queryWrapper);
+							if(parentDept != null) {
+								sysDepart.setParentId(parentDept.getId());
+							} else {
+								sysDepart.setParentId("");
+							}
+						}else{
 							sysDepart.setParentId("");
 						}
-                	}else{
-                		sysDepart.setParentId("");
+						//update-begin---author:liusq   Date:20210223  for：批量导入部门以后，不能追加下一级部门 #2245------------
+						sysDepart.setOrgType(sysDepart.getOrgCode().length()/codeLength+"");
+						//update-end---author:liusq   Date:20210223  for：批量导入部门以后，不能追加下一级部门 #2245------------
+						sysDepart.setDelFlag(CommonConstant.DEL_FLAG_0.toString());
 					}
-					//update-begin---author:liusq   Date:20210223  for：批量导入部门以后，不能追加下一级部门 #2245------------
-					sysDepart.setOrgType(sysDepart.getOrgCode().length()/codeLength+"");
-					//update-end---author:liusq   Date:20210223  for：批量导入部门以后，不能追加下一级部门 #2245------------
-					sysDepart.setDelFlag(CommonConstant.DEL_FLAG_0.toString());
-					int lineNumber = num +1;
 					try {
-						List<String> errorList = ValidUtil.validateReturnList(sysDepart);
-						if (!errorList.isEmpty()){
-							errorMessage.add("第 " + lineNumber + " 行："+ StringUtils.join(errorList,"，"));
-						}
 						LambdaQueryWrapper<SysDepart> wrapper = new LambdaQueryWrapper<>();
 						wrapper.eq(SysDepart::getDepartName,sysDepart.getDepartName());
 						if (sysDepartService.count(wrapper) > 0) {
@@ -467,11 +469,13 @@ public class SysDepartController {
 					}
 					num++;
                 }
-				//清空部门缓存
-				Set keys3 = redisTemplate.keys(CacheConstant.SYS_DEPARTS_CACHE + "*");
-				Set keys4 = redisTemplate.keys(CacheConstant.SYS_DEPART_IDS_CACHE + "*");
-				redisTemplate.delete(keys3);
-				redisTemplate.delete(keys4);
+				if (errorMessage.isEmpty()){
+					//清空部门缓存
+					Set keys3 = redisTemplate.keys(CacheConstant.SYS_DEPARTS_CACHE + "*");
+					Set keys4 = redisTemplate.keys(CacheConstant.SYS_DEPART_IDS_CACHE + "*");
+					redisTemplate.delete(keys3);
+					redisTemplate.delete(keys4);
+				}
 				return ImportExcelUtil.importReturnRes(errorMessage.size(), errorMessage);
             } catch (Exception e) {
                 log.error(e.getMessage(),e);
diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/model/SysDepartExcel.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/model/SysDepartExcel.java
index 4a83c47f..ddf9a719 100644
--- a/jero-boot-module-system/src/main/java/com/jero/modules/system/model/SysDepartExcel.java
+++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/model/SysDepartExcel.java
@@ -34,6 +34,7 @@ public class SysDepartExcel {
 
     /**机构编码*/
     @Excel(name="机构编码",width=15,orderNum = "2")
+    @NotBlank(message = "机构编码不能为空")
     private String orgCode;
     /**手机号*/
     @Excel(name="手机号",width=15,orderNum = "5")