commit

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<Address> {
     @ApiModelProperty("层级")
     private Integer level;
 
-    @ApiModelProperty("排序")
+    //@ApiModelProperty("排序")
-    private boolean lastLevel;
+    //private boolean lastLevel;
 
 }

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<Address> addressList = addressService.queryList(address);
-        return R.ok(addressList, addressList.size());
-    }
-
     /**
      * 根据parentIds列表查询list
-     * @param parentIds
      * @return
      */
-    @ApiOperation(value = "根据parentIds列表查询list")
+    @ApiOperation(value = "根据parentId列表查询list")
-    @GetMapping("/queryByParentIds/{ids}")
+    @GetMapping("/queryByParentId")
-    public R queryByParentIds(@PathVariable("ids") String[] parentIds) {
+    public R queryByParentIds( Address address) {
-        if (ObjectUtil.isEmpty(parentIds)) {
+        List<Address> addressList = addressService.list(Wrappers.<Address>lambdaQuery().eq(Address::getParentId, address.getParentId()));
-            return R.ok(new ArrayList<>(), 0);
-        }
-        List<Address> addressList = addressService.queryListByParentIds(Arrays.asList(parentIds));
         return R.ok(addressList, addressList.size());
     }
 

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/Address.xml

@@ -6,7 +6,7 @@
         <id column="code" property="code" />
         <result column="parent_id" property="parentId" />
         <result column="level" property="level" />
-        <result column="lastLevel" property="lastLevel" />
+        <!--<result column="lastLevel" property="lastLevel" />-->
         <result column="name" property="name" />
         <result column="sort" property="sort" />
         <result column="tenant_id" property="tenantId" />
@@ -45,7 +45,7 @@
     </select>
 
     <select id="queryListByParentIds" resultType="com.cloud.kicc.system.api.entity.Address">
-        SELECT code, level, (select count(code)=0 from sys_address a2 where a2.parent_id = a.code) lastLevel, parent_id,
+        SELECT code, level, (select count(code)=0 from sys_address a2 where a2.parent_id = a.code)  parent_id,
         name, sort, create_by_id,
         create_by_name, create_time,
         update_by_id, update_by_name, update_time,