diff --git a/src/main/java/com/pms/ocp/controller/ModelBaseController.java b/src/main/java/com/pms/ocp/controller/ModelBaseController.java
index 02a0b8f6f4ea693b1659097472af8f9c7124de96..bde59fd4923ed16e0695b11cbb7170ae6f79a2b3 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 30433cfb28ea49a1492b910c79863543e0caa880..8eb187c68631e4c7e2f487c3f65c6f0b8682988a 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);