Преглед на файлове

Merge branch 'release_toaliyun_real' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real

release_toaliyun_real
xhxu преди 3 години
родител
ревизия
e326c8a991
променени са 2 файла, в които са добавени 4 реда и са изтрити 0 реда
  1. +1
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java
  2. +3
    -0
      mallinkService/src/main/resources/mapper/WxBusinessMapper.xml

+ 1
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java Целия файл

@@ -288,6 +288,7 @@ public class WxBusinessServiceImpl implements WxBusinessService {
List<WxBusiness> treeList = new ArrayList<WxBusiness>();
for (WxBusiness business:childs) {
buildChildTree(business,childMap);
treeList.add(business);
}
if (treeList.size() > 0 ) {
parent.setChildren(treeList);


+ 3
- 0
mallinkService/src/main/resources/mapper/WxBusinessMapper.xml Целия файл

@@ -95,6 +95,9 @@
<if test=" 1 == isRoot">
and `parent_id` is null
</if>
<if test=" null != isDel ">
and `is_del` = #{isDel}
</if>
order by create_date asc
</select>



Зареждане…
Отказ
Запис