diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/controller/ParamsExportTemplateEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/controller/ParamsExportTemplateEOController.java index 84350f28f..95be495b5 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/controller/ParamsExportTemplateEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/controller/ParamsExportTemplateEOController.java @@ -188,7 +188,6 @@ public class ParamsExportTemplateEOController extends JeroController regionList, ParamsExportTemplateEO exportTemplateEO) { //适用地区 List dictModelList = new ArrayList<>(); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/entity/ParamsExportTemplateEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/entity/ParamsExportTemplateEO.java index 468b24d7a..e98dd8f83 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/entity/ParamsExportTemplateEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/entity/ParamsExportTemplateEO.java @@ -98,7 +98,6 @@ public class ParamsExportTemplateEO implements Serializable { private String orderByField; // 字段 //适用地区 - private String region; @TableField(exist = false) private String regionName; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java index be4930f0c..369928b37 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java @@ -406,7 +406,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl sysDictItems = sysDictItemServiceImpl.selectItemsAll(); //技术领域处理 - treeDict(dummyInventoryInfoEO, dummyInventoryInfoEOList); + treeDict(dummyInventoryInfoEO, dummyInventoryInfoEOList,sysDictItems); log.info("二阶段消耗时间:" + (System.currentTimeMillis() - startTime)); this.dataDicDispose(dummyInventoryInfoEOList,dummyInventoryInfoEO.getCut()); log.info("三阶段消耗时间:" + (System.currentTimeMillis() - startTime)); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index ac03aa424..14dc6076d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -977,7 +977,6 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl