From 2d0d1c267d7a8ada8f3cb6128ef451c4cdf501e9 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 14 Apr 2022 14:53:49 +0800
Subject: [PATCH] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E9=A1=B5--=E4=B8=8D=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DummyInventoryInfoEOController.java       |  4 ++--
 .../service/IDummyInventoryInfoEOService.java |  2 +-
 .../impl/DummyInventoryInfoEOServiceImpl.java | 19 +++++++++++--------
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/controller/DummyInventoryInfoEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/controller/DummyInventoryInfoEOController.java
index 9b4dda171..23e3dce74 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/controller/DummyInventoryInfoEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/controller/DummyInventoryInfoEOController.java
@@ -67,8 +67,8 @@ public class DummyInventoryInfoEOController extends JeroController<DummyInventor
 	@AutoLog(value = "虚拟清单详情表-列表查询")
     @ApiOperation(value="虚拟清单详情表-列表查询", notes="虚拟清单详情表-列表查询")
 	@GetMapping(value = "/list")
-	public Result<List<DummyInventoryInfoEO>> queryList() {
-        List<DummyInventoryInfoEO> list = dummyInventoryInfoEOService.queryList();
+	public Result<List<DummyInventoryInfoEO>> queryList(DummyInventoryInfoEO dummyInventoryInfoEO,HttpServletRequest req) {
+        List<DummyInventoryInfoEO> list = dummyInventoryInfoEOService.queryList(dummyInventoryInfoEO,req);
         return Result.OK(list);
 	}
 
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/IDummyInventoryInfoEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/IDummyInventoryInfoEOService.java
index 08d8bd6f0..1781a5fe9 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/IDummyInventoryInfoEOService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/IDummyInventoryInfoEOService.java
@@ -63,7 +63,7 @@ public interface IDummyInventoryInfoEOService extends IService<DummyInventoryInf
 	 *
 	 * @return
 	 */
-    List<DummyInventoryInfoEO> queryList();
+    List<DummyInventoryInfoEO> queryList(DummyInventoryInfoEO dummyInventoryInfoEO,HttpServletRequest req);
 
 	IPage<DummyInventoryInfoEO>  getPageInfo(DummyInventoryInfoEO dummyInventoryInfoEO,HttpServletRequest req);
 
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 7b94794b3..2fe79cc04 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
@@ -55,9 +55,8 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 		QueryWrapper<DummyInventoryInfoEO> queryWrapper = QueryGenerator.initQueryWrapper(dummyInventoryInfoEO, req.getParameterMap());
 		Page<DummyInventoryInfoEO> page = new Page<DummyInventoryInfoEO>(dummyInventoryInfoEO.getPageNo(), dummyInventoryInfoEO.getPageSize());
 		IPage<DummyInventoryInfoEO> pageInfo = this.page(page, queryWrapper);
-
 		//技术领域处理
-		treeDict(dummyInventoryInfoEO, pageInfo);
+//		treeDict(dummyInventoryInfoEO, pageInfo);
 		return pageInfo;
 	}
 
@@ -143,8 +142,12 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 	 * @return
 	 */
 	@Override
-    public List<DummyInventoryInfoEO> queryList() {
-        return list();
+    public List<DummyInventoryInfoEO> queryList(DummyInventoryInfoEO dummyInventoryInfoEO,HttpServletRequest req) {
+		QueryWrapper<DummyInventoryInfoEO> queryWrapper = QueryGenerator.initQueryWrapper(dummyInventoryInfoEO,req.getParameterMap());
+		List<DummyInventoryInfoEO> dummyInventoryInfoEOList = this.list(queryWrapper);
+		//技术领域处理
+		treeDict(dummyInventoryInfoEO, dummyInventoryInfoEOList);
+        return dummyInventoryInfoEOList;
     }
 
 
@@ -181,12 +184,12 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 	/**
 	 * 技术领域数据字典处理
 	 * @param dummyInventoryInfoEO
-	 * @param pageInfo
+	 * @param dummyInventoryInfoEOList
 	 */
-	private void treeDict(DummyInventoryInfoEO dummyInventoryInfoEO, IPage<DummyInventoryInfoEO> pageInfo) {
+	private void treeDict(DummyInventoryInfoEO dummyInventoryInfoEO, List<DummyInventoryInfoEO> dummyInventoryInfoEOList) {
 		Set<String> technologyTerritorySet = new HashSet<>();
 		List<String> deliverableList = new ArrayList<>();
-		for (DummyInventoryInfoEO record : pageInfo.getRecords()) {
+		for (DummyInventoryInfoEO record : dummyInventoryInfoEOList) {
 			//技术领域
 			if(StringUtils.isNotBlank(record.getTechnologyTerritory())){
 				List<String> list = Arrays.asList(record.getTechnologyTerritory().split(","));
@@ -216,7 +219,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 		LambdaQueryWrapper<SysCategory> wrapper = new LambdaQueryWrapper<>();
 		wrapper.in(SysCategory::getId, technologyTerritorySet);
 		List<SysCategory> categoryList = sysCategoryService.list(wrapper);
-		for (DummyInventoryInfoEO record : pageInfo.getRecords()) {
+		for (DummyInventoryInfoEO record : dummyInventoryInfoEOList) {
 			//技术领域
 			if (categoryList.size() != 0 && StringUtils.isNotBlank(record.getTechnologyTerritory())) {
 				List<String> technologyTerritoryList = Arrays.asList(record.getTechnologyTerritory().split(","));