diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/docTranslation/controller/DocTranslationEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/docTranslation/controller/DocTranslationEOController.java index 1ffb02b43..506e32cc6 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/docTranslation/controller/DocTranslationEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/docTranslation/controller/DocTranslationEOController.java @@ -5,12 +5,9 @@ import java.util.List; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import com.jero.common.api.vo.Result; -import com.jero.common.system.query.QueryGenerator; import com.jero.modules.docTranslation.entity.DocTranslationEO; import com.jero.modules.docTranslation.service.IDocTranslationEOService; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; import com.jero.common.system.base.controller.JeroController; import org.springframework.beans.factory.annotation.Autowired; @@ -21,7 +18,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import com.jero.common.aspect.annotation.AutoLog; - /** * @Description: 文档翻译表 * @Author: jero-boot @@ -53,9 +49,7 @@ public class DocTranslationEOController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(docTranslationEO, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = docTranslationEOService.page(page, queryWrapper); + IPage pageList = docTranslationEOService.queryPageList(docTranslationEO,pageNo,pageSize,cut,req); return Result.OK(cut,pageList); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/docTranslation/service/IDocTranslationEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/docTranslation/service/IDocTranslationEOService.java index 432741eb5..1ff232e8c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/docTranslation/service/IDocTranslationEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/docTranslation/service/IDocTranslationEOService.java @@ -1,7 +1,10 @@ package com.jero.modules.docTranslation.service; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.modules.docTranslation.entity.DocTranslationEO; import com.baomidou.mybatisplus.extension.service.IService; + +import javax.servlet.http.HttpServletRequest; import java.util.List; /** @@ -58,4 +61,15 @@ public interface IDocTranslationEOService extends IService { * @return */ List queryList(); + + /** + * 分页查询 + * @param docTranslationEO + * @param pageNo + * @param pageSize + * @param cut + * @param req + * @return + */ + IPage queryPageList(DocTranslationEO docTranslationEO, Integer pageNo, Integer pageSize, String cut, HttpServletRequest req); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/docTranslation/service/impl/DocTranslationEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/docTranslation/service/impl/DocTranslationEOServiceImpl.java index 20b0115d2..fa9549e06 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/docTranslation/service/impl/DocTranslationEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/docTranslation/service/impl/DocTranslationEOServiceImpl.java @@ -1,5 +1,10 @@ package com.jero.modules.docTranslation.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jero.common.system.query.QueryGenerator; +import com.jero.common.system.vo.LoginUser; import com.jero.modules.docTranslation.entity.DocTranslationEO; import com.jero.modules.docTranslation.enums.ReleaseConditionEnum; import com.jero.modules.docTranslation.enums.TranslationResultEnum; @@ -7,6 +12,8 @@ import com.jero.modules.docTranslation.mapper.DocTranslationEOMapper; import com.jero.modules.docTranslation.service.IDocTranslationEOService; import com.jero.modules.docTranslation.utils.TranslationDocumentUtils; import com.jero.modules.oss.entity.OSSFile; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.shiro.SecurityUtils; import org.springframework.stereotype.Service; import java.util.*; @@ -15,6 +22,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; +import javax.servlet.http.HttpServletRequest; + /** * @Description: 文档翻译表 * @Author: jero-boot @@ -103,4 +112,24 @@ public class DocTranslationEOServiceImpl extends ServiceImpl queryList() { return list(); } + + @Override + public IPage queryPageList(DocTranslationEO docTranslationEO, Integer pageNo, Integer pageSize, String cut, HttpServletRequest req) { + Page page = new Page(pageNo, pageSize); + + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(docTranslationEO, req.getParameterMap()); + // 获取当前登录人 + LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + /** + * 数据权限:自己创建的、或发布情况为“已发布”的数据 + */ + queryWrapper.lambda().and(query -> { + query.eq(DocTranslationEO::getCreateBy,currentUser.getUsername()); + query.or(o -> { + o.eq(DocTranslationEO::getReleaseCondition,ReleaseConditionEnum.PUBLISHED.getValue()); + }); + }); + IPage result = this.page(page, queryWrapper); + return result; + } }