修改bug

src/main/java/com/pms/ocp/controller/ModelBaseController.java

@@ -278,11 +278,6 @@ public class ModelBaseController {
                                            @ApiParam(value = "当前页") @RequestParam(value = "currentPage", required = false) Integer currentPage,
                                            @ApiParam(value = "每页数量") @RequestParam(value = "pageSize", required = false) Integer pageSize) {
 
-//        PageHelper.startPage(currentPage, pageSize);
-//        List<ModelProperty> modelPropertyVOList = modelPropertyService.listModelProperty(objId, modelCode, subsCompanyCode);
-//        PageInfo<ModelProperty> pageInfo = new PageInfo<>(modelPropertyVOList);
-
-
         PageHelper.startPage(currentPage, pageSize);
         List<ModelPropertyVO> pageInfo = modelPropertyService.listModelPropertyVO(currentPage, pageSize, modelCode, ownerCompanyCode, modelGroupCode);
         PageInfo<ModelPropertyVO> pageInfo1 = new PageInfo<>(pageInfo);
@@ -334,8 +329,9 @@ public class ModelBaseController {
     @ApiOperation("模型拓扑关系-查询")
     @GetMapping("/get/model/topology")
     public ResponseVO getModelTopology(@ApiParam(value = "模型拓扑关系编号") @RequestParam(value = "objId", required = false) String objId,
+                                       @ApiParam(value = "模型归属分类编码") @RequestParam(value = "modelGroupCode", required = false) String modelGroupCode,
                                        @ApiParam(value = "模型编码") @RequestParam(value = "modelCode", required = false) String modelCode) {
-        return ResponseVO.ok(modelRelationService.getModelRelationList(objId, modelCode));
+        return ResponseVO.ok(modelRelationService.getModelRelationList(objId, modelGroupCode, modelCode));
     }
 
     /**
@@ -351,7 +347,7 @@ public class ModelBaseController {
     }
 
 
-    @ApiOperation("模型列表-导航树")
+    @ApiOperation("模型-导航树")
     @GetMapping("/delete/model/modelListNavigation")
     public ResponseVO modelListNavigation(@RequestParam(required = false) String searchCondition) {
         return modelSubscribeService.modelListNavigation(searchCondition);

src/main/java/com/pms/ocp/model/dto/TenanBaseDto.java

@@ -227,8 +227,7 @@ public class TenanBaseDto extends OcpTenantGroup {
         this.tenantGroupLevel = tenantGroupLevel;
     }
 
-    public OcpTenantGroup setClassIfy(String classIfy) {
+    public void setClassIfy(String classIfy) {
         this.classIfy = classIfy;
-        return null;
     }
 }

src/main/java/com/pms/ocp/service/ModelRelationService.java

@@ -53,7 +53,7 @@ public interface ModelRelationService {
      * @param
      * @return
      */
-    List<ModelRelation> getModelRelationList(String objId, String modelCode);
+    List<ModelRelation> getModelRelationList(String objId, String modelGroupCode, String modelCode);
 
     /**
      * 获取模型关系列表

src/main/java/com/pms/ocp/service/impl/ModelRelationServiceImpl.java

@@ -65,13 +65,17 @@ public class ModelRelationServiceImpl implements ModelRelationService {
     }
 
     @Override
-    public List<ModelRelation> getModelRelationList(String objId, String modelCode) {
+    public List<ModelRelation> getModelRelationList(String objId, String modelGroupCode, String modelCode) {
         QueryWrapper<ModelRelation> queryWrapper = new QueryWrapper();
 
         if (StringUtils.isNotEmpty(objId)) {
             queryWrapper.lambda().eq(ModelRelation::getObjId, objId);
         }
 
+        if (StringUtils.isNotEmpty(modelGroupCode)) {
+            queryWrapper.lambda().eq(ModelRelation::getModelPropCode, modelGroupCode);
+        }
+
         if (StringUtils.isNotEmpty(modelCode)) {
             queryWrapper.lambda().eq(ModelRelation::getModelCode, modelCode);
         }