diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataCategoryVO.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataCategoryVO.java index 58982b571..df6db0586 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataCategoryVO.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataCategoryVO.java @@ -16,6 +16,9 @@ */ package com.logpm.basicdata.vo; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.logpm.basicdata.entity.BasicdataCategoryEntity; import org.springblade.core.tool.node.INode; import lombok.Data; @@ -31,5 +34,19 @@ import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = true) public class BasicdataCategoryVO extends BasicdataCategoryEntity { private static final long serialVersionUID = 1L; + private String title; + @JsonSerialize( + using = ToStringSerializer.class + ) + private Long key; + @JsonSerialize( + using = ToStringSerializer.class + ) + private Long value; + + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private Boolean hasChildren; + + } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataCategoryController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataCategoryController.java index db62b69e3..9f8312e41 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataCategoryController.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataCategoryController.java @@ -90,6 +90,18 @@ public class BasicdataCategoryController extends BladeController { return R.data(pages); } + + /** + * 懒加载获取品分类树形结构 + */ + @GetMapping("/lazy-tree") + @ApiOperationSupport(order = 5) + @ApiOperation(value = "懒加载树形结构", notes = "树形结构") + public R> lazyTree(String tenantId, Long parentId, BladeUser bladeUser) { + List tree = basicdataCategoryService.lazyTree(Func.toStrWithEmpty(tenantId, bladeUser.getTenantId()),parentId); + return R.data(tree); + } + /** * 品类 新增 */ diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataCategoryMapper.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataCategoryMapper.java index 70478ecb3..872d79646 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataCategoryMapper.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataCategoryMapper.java @@ -51,4 +51,5 @@ public interface BasicdataCategoryMapper extends BaseMapper exportBasicdataCategory(@Param("ew") Wrapper queryWrapper); + List lazyTree(String tenantId,Long parentId); } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataCategoryMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataCategoryMapper.xml index 1b393c3f5..59f88a2e7 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataCategoryMapper.xml +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataCategoryMapper.xml @@ -30,11 +30,70 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +