From 3917ba9d1b833c32a0c7fb24556953d94c7dd895 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Thu, 21 Oct 2021 15:14:10 +0800
Subject: [PATCH] =?UTF-8?q?fix=20bug=2041165=20=E5=AF=BC=E5=85=A5--?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E7=9A=84=E6=96=87=E4=BB=B6=E4=B8=AD=E2=80=98?=
 =?UTF-8?q?=E6=9C=BA=E6=9E=84=E5=90=8D=E7=A7=B0=E2=80=99=E5=BF=85=E5=A1=AB?=
 =?UTF-8?q?=E9=A1=B9=E4=B8=BA=E7=A9=BA=EF=BC=8C=E5=AF=BC=E5=85=A5=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5=E5=90=8E=E6=97=A0=E6=98=8E=E7=A1=AE=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jero/common/util/oConvertUtils.java   | 22 +++++++++++++++++++
 .../controller/SysDepartController.java       |  2 ++
 2 files changed, 24 insertions(+)

diff --git a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/oConvertUtils.java b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/oConvertUtils.java
index 02084ce3..91134d0b 100644
--- a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/oConvertUtils.java
+++ b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/oConvertUtils.java
@@ -677,4 +677,26 @@ public class oConvertUtils {
 			return null;
 		}
 	}
+
+	/**
+	 * 判断对象中的属性值是否都为null
+	 * @param object
+	 * @return
+	 */
+	public static boolean checkObjAllFieldsIsNull(Object object) {
+		if (null == object) {
+			return true;
+		}
+		try {
+			for (Field f : object.getClass().getDeclaredFields()) {
+				f.setAccessible(true);
+				if (f.get(object) != null && StringUtils.isNotBlank(f.get(object).toString())) {
+					return false;
+				}
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return true;
+	}
 }
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 d4104380..32817cb9 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
@@ -3,6 +3,7 @@ package com.jero.modules.system.controller;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.util.*;
+import java.util.stream.Collectors;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -409,6 +410,7 @@ public class SysDepartController {
             	// orgCode编码长度
 				int codeLength = YouBianCodeUtil.zhanweiLength;
                 listSysDeparts = ExcelImportUtil.importExcel(file.getInputStream(), SysDepartExcel.class, params);
+				listSysDeparts = listSysDeparts.stream().filter(i -> !oConvertUtils.checkObjAllFieldsIsNull(i)).collect(Collectors.toList());
                 //按长度排序
                 Collections.sort(listSysDeparts, new Comparator<SysDepartExcel>() {
                     @Override