diff --git a/chushang-common/chushang-common-bom/pom.xml b/chushang-common/chushang-common-bom/pom.xml index 65aa074..29ddd54 100644 --- a/chushang-common/chushang-common-bom/pom.xml +++ b/chushang-common/chushang-common-bom/pom.xml @@ -44,7 +44,7 @@ com.chushang - chushang-common-excel + chushang-common-office ${common.version} diff --git a/chushang-common/chushang-common-data-scope/src/main/java/com/chushang/datascope/aspect/DataScopeAspect.java b/chushang-common/chushang-common-data-scope/src/main/java/com/chushang/datascope/aspect/DataScopeAspect.java index 64d817f..04e6a12 100644 --- a/chushang-common/chushang-common-data-scope/src/main/java/com/chushang/datascope/aspect/DataScopeAspect.java +++ b/chushang-common/chushang-common-data-scope/src/main/java/com/chushang/datascope/aspect/DataScopeAspect.java @@ -163,16 +163,17 @@ public class DataScopeAspect { private Map getSqlParam(final JoinPoint joinPoint){ Object[] args = joinPoint.getArgs(); if (null == args || args.length == 0) return new HashMap<>(); - Object params = joinPoint.getArgs()[0]; - Map sqlParam; - if (StringUtils.isNotNull(params) && params instanceof BaseEntity) { - BaseEntity baseEntity = (BaseEntity) params; - sqlParam = baseEntity.getSqlParam(); - } else if (StringUtils.isNotNull(params) && params instanceof CommonParam) { - CommonParam commonParam = (CommonParam) params; - sqlParam = commonParam.getSqlParam(); - }else { - return new HashMap<>(); + Map sqlParam = new HashMap<>(); + for (Object arg : args) { + if (!(arg instanceof BaseEntity || arg instanceof CommonParam)) { + continue; + } + if (arg instanceof BaseEntity baseEntity) { + sqlParam = baseEntity.getSqlParam(); + } else { + CommonParam commonParam = (CommonParam) arg; + sqlParam = commonParam.getSqlParam(); + } } return sqlParam; } diff --git a/chushang-common/chushang-common-excel/pom.xml b/chushang-common/chushang-common-excel/pom.xml deleted file mode 100644 index 18f596b..0000000 --- a/chushang-common/chushang-common-excel/pom.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - chushang-common - com.chushang - 1.0.0 - - 4.0.0 - - chushang-common-excel - - - - com.chushang - chushang-common-core - - - com.alibaba - easyexcel - - - diff --git a/chushang-common/chushang-common-office/pom.xml b/chushang-common/chushang-common-office/pom.xml new file mode 100644 index 0000000..a478431 --- /dev/null +++ b/chushang-common/chushang-common-office/pom.xml @@ -0,0 +1,84 @@ + + + + chushang-common + com.chushang + 1.0.0 + + 4.0.0 + + chushang-common-office + + + 操作office 相关文件, word, excel 等 + + + + com.chushang + chushang-common-core + + + com.alibaba + easyexcel + + + org.apache.poi + poi + + + org.apache.poi + poi-ooxml + + + org.apache.poi + poi-ooxml-schemas + + + commons-io + commons-io + + + + + commons-io + commons-io + 2.15.0 + + + com.deepoove + poi-tl + 1.12.2 + + + org.apache.xmlgraphics + batik-bridge + + + org.apache.poi + poi-ooxml + + + commons-io + commons-io + + + + + org.apache.poi + poi + 5.2.5 + + + org.apache.poi + poi-ooxml + 5.2.5 + + + org.apache.poi + poi-ooxml-schemas + 4.1.2 + + + diff --git a/chushang-common/chushang-common-excel/src/main/java/com/chushang/common/excel/convert/ExcelBigNumberConvert.java b/chushang-common/chushang-common-office/src/main/java/com/chushang/common/excel/convert/ExcelBigNumberConvert.java similarity index 100% rename from chushang-common/chushang-common-excel/src/main/java/com/chushang/common/excel/convert/ExcelBigNumberConvert.java rename to chushang-common/chushang-common-office/src/main/java/com/chushang/common/excel/convert/ExcelBigNumberConvert.java diff --git a/chushang-common/chushang-common-excel/src/main/java/com/chushang/common/excel/convert/LocalDateTimeConvert.java b/chushang-common/chushang-common-office/src/main/java/com/chushang/common/excel/convert/LocalDateTimeConvert.java similarity index 100% rename from chushang-common/chushang-common-excel/src/main/java/com/chushang/common/excel/convert/LocalDateTimeConvert.java rename to chushang-common/chushang-common-office/src/main/java/com/chushang/common/excel/convert/LocalDateTimeConvert.java diff --git a/chushang-common/chushang-common-excel/src/main/java/com/chushang/common/excel/convert/StringConvert.java b/chushang-common/chushang-common-office/src/main/java/com/chushang/common/excel/convert/StringConvert.java similarity index 100% rename from chushang-common/chushang-common-excel/src/main/java/com/chushang/common/excel/convert/StringConvert.java rename to chushang-common/chushang-common-office/src/main/java/com/chushang/common/excel/convert/StringConvert.java diff --git a/chushang-common/chushang-common-excel/src/main/java/com/chushang/common/excel/listener/DataListener.java b/chushang-common/chushang-common-office/src/main/java/com/chushang/common/excel/listener/DataListener.java similarity index 100% rename from chushang-common/chushang-common-excel/src/main/java/com/chushang/common/excel/listener/DataListener.java rename to chushang-common/chushang-common-office/src/main/java/com/chushang/common/excel/listener/DataListener.java diff --git a/chushang-common/chushang-common-excel/src/main/java/com/chushang/common/excel/listener/DefaultExcelListener.java b/chushang-common/chushang-common-office/src/main/java/com/chushang/common/excel/listener/DefaultExcelListener.java similarity index 100% rename from chushang-common/chushang-common-excel/src/main/java/com/chushang/common/excel/listener/DefaultExcelListener.java rename to chushang-common/chushang-common-office/src/main/java/com/chushang/common/excel/listener/DefaultExcelListener.java diff --git a/chushang-common/chushang-common-excel/src/main/java/com/chushang/common/excel/listener/ImportListener.java b/chushang-common/chushang-common-office/src/main/java/com/chushang/common/excel/listener/ImportListener.java similarity index 100% rename from chushang-common/chushang-common-excel/src/main/java/com/chushang/common/excel/listener/ImportListener.java rename to chushang-common/chushang-common-office/src/main/java/com/chushang/common/excel/listener/ImportListener.java diff --git a/chushang-common/chushang-common-excel/src/main/java/com/chushang/common/excel/service/ExcelImporter.java b/chushang-common/chushang-common-office/src/main/java/com/chushang/common/excel/service/ExcelImporter.java similarity index 100% rename from chushang-common/chushang-common-excel/src/main/java/com/chushang/common/excel/service/ExcelImporter.java rename to chushang-common/chushang-common-office/src/main/java/com/chushang/common/excel/service/ExcelImporter.java diff --git a/chushang-common/chushang-common-excel/src/main/java/com/chushang/common/excel/utils/ExcelUtils.java b/chushang-common/chushang-common-office/src/main/java/com/chushang/common/excel/utils/ExcelUtils.java similarity index 100% rename from chushang-common/chushang-common-excel/src/main/java/com/chushang/common/excel/utils/ExcelUtils.java rename to chushang-common/chushang-common-office/src/main/java/com/chushang/common/excel/utils/ExcelUtils.java diff --git a/chushang-common/chushang-common-excel/src/main/resources/META-INF/spring.factories b/chushang-common/chushang-common-office/src/main/resources/META-INF/spring.factories similarity index 100% rename from chushang-common/chushang-common-excel/src/main/resources/META-INF/spring.factories rename to chushang-common/chushang-common-office/src/main/resources/META-INF/spring.factories diff --git a/chushang-common/pom.xml b/chushang-common/pom.xml index c2e9ba6..b7294bd 100644 --- a/chushang-common/pom.xml +++ b/chushang-common/pom.xml @@ -20,7 +20,7 @@ chushang-common-data-scope chushang-common-dict chushang-common-easy-es - chushang-common-excel + chushang-common-office chushang-common-feign chushang-common-job chushang-common-log