|
|
@@ -7,11 +7,11 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
|
|
|
-import com.baomidou.mybatisplus.extension.api.R;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import com.zhongzheng.bo.*;
|
|
|
import com.zhongzheng.entity.*;
|
|
|
import com.zhongzheng.exception.CustomException;
|
|
|
+import com.zhongzheng.mapper.OfficialArticleMapper;
|
|
|
import com.zhongzheng.service.*;
|
|
|
import com.zhongzheng.util.DateUtils;
|
|
|
import com.zhongzheng.util.HttpUtils;
|
|
|
@@ -21,9 +21,9 @@ import lombok.extern.slf4j.Slf4j;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
+import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
import java.util.ArrayList;
|
|
|
-import java.util.Collections;
|
|
|
import java.util.HashMap;
|
|
|
import java.util.List;
|
|
|
import java.util.stream.Collectors;
|
|
|
@@ -67,6 +67,7 @@ public class OfficialApiServiceImpl implements IOfficialApiService {
|
|
|
|
|
|
|
|
|
@Override
|
|
|
+ @Transactional // 必须添加此注解
|
|
|
public List<OfficialMenuVo> listOfficialMenu(OfficialMenuQuery query) {
|
|
|
//获取一级菜单
|
|
|
List<OfficialMenu> list = officialMenuService.list(new LambdaQueryWrapper<OfficialMenu>()
|
|
|
@@ -92,7 +93,7 @@ public class OfficialApiServiceImpl implements IOfficialApiService {
|
|
|
//获取所有子集id
|
|
|
getChildrenIds(query.getParentId(),menuIds);
|
|
|
}
|
|
|
- Page<OfficialArticle> list = officialArticleService.page(new Page<>(query.getPageSize(),query.getPageNum()),
|
|
|
+ Page<OfficialArticle> list = officialArticleService.page(new Page<>(query.getPageNum(),query.getPageSize()),
|
|
|
new LambdaQueryWrapper<OfficialArticle>()
|
|
|
.eq(ObjectUtils.isNotNull(query.getMenuId()),OfficialArticle::getMenuId, query.getMenuId())
|
|
|
.in(CollectionUtils.isNotEmpty(menuIds),OfficialArticle::getMenuId,menuIds)
|