Explorar el Código

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

release_toaliyun_real
xhxu hace 3 años
padre
commit
e326c8a991
Se han modificado 2 ficheros con 4 adiciones y 0 borrados
  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 Ver fichero

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


+ 3
- 0
mallinkService/src/main/resources/mapper/WxBusinessMapper.xml Ver fichero

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




Cargando…
Cancelar
Guardar