diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/ImportExcelUtil.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/ImportExcelUtil.java index 0768e351..94666c91 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/ImportExcelUtil.java +++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/ImportExcelUtil.java @@ -6,7 +6,6 @@ import com.jero.common.api.vo.Result; import com.jero.common.constant.CommonConstant; import com.jero.common.exception.JeroBootException; import lombok.extern.slf4j.Slf4j; -import org.apache.poi.ss.formula.functions.T; import java.io.File; import java.util.List; @@ -20,7 +19,7 @@ public class ImportExcelUtil { } - public static Result imporReturnRes(int errorLines, int successLines, List errorMessage){ + public static Result imporReturnRes(int errorLines, int successLines, List errorMessage){ if (errorLines == 0) { return Result.OK("共" + successLines + "行数据全部导入成功!"); } else { diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java index 2f4acaff..b60c67da 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java @@ -424,7 +424,7 @@ public class SysDepartController { query.orderByAsc(SysDepart::getOrgCode); if(oConvertUtils.isNotEmpty(id)){ String[] arr = id.split(","); - query.in(SysDepart::getId,arr); + query.in(SysDepart::getId,Arrays.asList(arr)); } List ls = this.sysDepartService.list(query); return Result.OK(ls);