diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java index ede08a837..67c8d8591 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java @@ -288,6 +288,7 @@ public class WxBusinessServiceImpl implements WxBusinessService { List treeList = new ArrayList(); for (WxBusiness business:childs) { buildChildTree(business,childMap); + treeList.add(business); } if (treeList.size() > 0 ) { parent.setChildren(treeList); diff --git a/mallinkService/src/main/resources/mapper/WxBusinessMapper.xml b/mallinkService/src/main/resources/mapper/WxBusinessMapper.xml index 1d075cbc0..e3c1430a7 100644 --- a/mallinkService/src/main/resources/mapper/WxBusinessMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBusinessMapper.xml @@ -95,6 +95,9 @@ and `parent_id` is null + + and `is_del` = #{isDel} + order by create_date asc