From f67172f4f0a64cd39e063a0e675df3878a1b2cff Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Wed, 28 Dec 2022 16:38:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E4=BB=A3=E7=A0=81=E5=90=88?=
 =?UTF-8?q?=E5=B9=B6=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../report/controller/ParamsExportTemplateEOController.java     | 1 -
 .../jero/modules/cert/report/entity/ParamsExportTemplateEO.java | 1 -
 .../dummy/service/impl/DummyInventoryInfoEOServiceImpl.java     | 2 +-
 .../project/service/impl/ProjectLawsInventoryEOServiceImpl.java | 1 -
 4 files changed, 1 insertion(+), 4 deletions(-)

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<ParamsExpor
 		return page;
 	}
 
-    /**
 	private String getRegion(ParamsExportTemplateEO paramsExportTemplateEO, List<DictModel> regionList, ParamsExportTemplateEO exportTemplateEO) {
 		//适用地区
 		List<DictModel> 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<DummyInventoryI
 		//数据字典
 		List<SysDictItem> 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<ProjectLawsIn
 				result = attestationRankSort(orderBy,orderByField,result,list);
 			}
 		}
-		log.info("四阶段消耗时间：" + (System.currentTimeMillis() - startTime));
 		return result;
 	}