|
|
|
@@ -16,13 +16,13 @@ import com.iformall.mapper.MallPermissionMapper; |
|
|
|
import com.iformall.mapper.MallUserInfoMapper; |
|
|
|
import com.iformall.mapper.WxMallMapper; |
|
|
|
import com.iformall.service.MallPermissionService; |
|
|
|
import org.apache.commons.collections.CollectionUtils; |
|
|
|
import org.slf4j.Logger; |
|
|
|
import org.slf4j.LoggerFactory; |
|
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
|
|
|
|
import java.util.ArrayList; |
|
|
|
import java.util.List; |
|
|
|
import java.util.*; |
|
|
|
|
|
|
|
@Service |
|
|
|
public class MallPermissionServiceImpl implements MallPermissionService { |
|
|
|
@@ -137,13 +137,16 @@ public class MallPermissionServiceImpl implements MallPermissionService { |
|
|
|
if(entity.getResourceType().equals(EnumPermissionType.CATALOG.getCode())){ |
|
|
|
entity.setChildren(getMenuTreeList(queryListParentId(entity.getId(), menuIdList, boolNav), menuIdList, boolNav)); |
|
|
|
} |
|
|
|
List<MallPermission> btnList = mallPermissionMapper.queryBtnListByParentId(entity.getId()); |
|
|
|
if (CollectionUtils.isNotEmpty(btnList)) { |
|
|
|
entity.setBtnChildren(btnList); |
|
|
|
} |
|
|
|
subMenuList.add(entity); |
|
|
|
} |
|
|
|
|
|
|
|
return subMenuList; |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
public PageInfo<MallPermission> listAsPage(MallPermission record, Integer pageIndex, Integer pageSize) { |
|
|
|
return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> mallPermissionMapper.findList(record)); |
|
|
|
|