From 5fe2353c4ff43a34fc5253b459b18ca1d79d43f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=83=A1=E7=A7=80=E6=AD=A6?= <18621965254@yeah.net>
Date: Fri, 25 Mar 2022 17:59:09 +0800
Subject: [PATCH] =?UTF-8?q?=E8=83=A1=E7=A7=80=E6=AD=A6:=E6=A8=A1=E5=9E=8B?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8bug=E8=A7=A3=E5=86=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pms/ocp/controller/ModelBaseController.java |  2 +-
 .../service/impl/ModelSubscribeServiceImpl.java | 17 +++++++++++------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/pms/ocp/controller/ModelBaseController.java b/src/main/java/com/pms/ocp/controller/ModelBaseController.java
index 02a0b8f..bde59fd 100644
--- a/src/main/java/com/pms/ocp/controller/ModelBaseController.java
+++ b/src/main/java/com/pms/ocp/controller/ModelBaseController.java
@@ -94,7 +94,7 @@ public class ModelBaseController {
      */
     @ApiOperation("模型-查询列表")
     @GetMapping("/get/model/getModeBaselList")
-    public ResponseVO getModeBaselList(@ApiParam(value = "所属级别") @RequestParam(value = "belongLevel", required = false) String belongLevel,
+    public ResponseVO getModeBaselList(@ApiParam(value = "所属级别") @RequestParam(value = "belongLevel",defaultValue = "0") String belongLevel,
                                        @ApiParam(value = "模型编码") @RequestParam(value = "modelCode", required = false) String modelCode,
                                        @ApiParam(value = "当前页") @RequestParam(value = "currentPage") Integer currentPage,
                                        @ApiParam(value = "每页数量") @RequestParam(value = "pageSize") Integer pageSize,
diff --git a/src/main/java/com/pms/ocp/service/impl/ModelSubscribeServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/ModelSubscribeServiceImpl.java
index 30433cf..8eb187c 100644
--- a/src/main/java/com/pms/ocp/service/impl/ModelSubscribeServiceImpl.java
+++ b/src/main/java/com/pms/ocp/service/impl/ModelSubscribeServiceImpl.java
@@ -119,13 +119,18 @@ public class ModelSubscribeServiceImpl implements ModelSubscribeService {
         return ResponseVO.ok(result);
     }
 
+    /**
+     * 合并list设置子类
+     * @param modelGroupList
+     * @param organList
+     * @param function
+     * @return
+     */
     private List<TreeNode> setChildren(List<TreeNode> modelGroupList, List<TreeNode> organList, BiFunction<TreeNode,TreeNode,Boolean> function) {
-        organList.forEach(org
-                ->{
-            modelGroupList.forEach(group->{
-                //org.getCompanyCode().equals(group.getCompanyCode()
-                if (function.apply(org,group)){
-                    if(org.getChildren() == null){
+        organList.forEach(org -> {
+            modelGroupList.forEach(group -> {
+                if (function.apply(org, group)) {
+                    if (org.getChildren() == null) {
                         org.setChildren(new LinkedList<>());
                     }
                     org.getChildren().add(group);
-- 
2.26.0