diff --git a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Address.java b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Address.java index 86614bdc..f0a889e8 100644 --- a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Address.java +++ b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Address.java @@ -27,7 +27,7 @@ public class Address extends TreeEntity
{ @ApiModelProperty("层级") private Integer level; - @ApiModelProperty("排序") - private boolean lastLevel; + //@ApiModelProperty("排序") + //private boolean lastLevel; } diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/AddressController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/AddressController.java index 0c197ac4..97c117e9 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/AddressController.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/AddressController.java @@ -3,6 +3,7 @@ package com.cloud.kicc.system.controller; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.cloud.kicc.common.core.api.R; import com.cloud.kicc.common.core.constant.AppConstants; import com.cloud.kicc.system.api.entity.Address; @@ -77,30 +78,14 @@ public class AddressController { return R.ok(addressService.getById(id)); } - /** - * 查询根据条件 - * @param address - * @return - */ - @ApiOperation(value = "首页查询") - @GetMapping("/list") - public R list(Address address) { - List
addressList = addressService.queryList(address); - return R.ok(addressList, addressList.size()); - } - /** * 根据parentIds列表查询list - * @param parentIds * @return */ - @ApiOperation(value = "根据parentIds列表查询list") - @GetMapping("/queryByParentIds/{ids}") - public R queryByParentIds(@PathVariable("ids") String[] parentIds) { - if (ObjectUtil.isEmpty(parentIds)) { - return R.ok(new ArrayList<>(), 0); - } - List
addressList = addressService.queryListByParentIds(Arrays.asList(parentIds)); + @ApiOperation(value = "根据parentId列表查询list") + @GetMapping("/queryByParentId") + public R queryByParentIds( Address address) { + List
addressList = addressService.list(Wrappers.
lambdaQuery().eq(Address::getParentId, address.getParentId())); return R.ok(addressList, addressList.size()); } diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/Address.xml b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/Address.xml index a18ec0ca..8f5968ad 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/Address.xml +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/Address.xml @@ -6,7 +6,7 @@ - + @@ -45,7 +45,7 @@