mybatis-plus-join

pom.xml

@@ -312,6 +312,12 @@
 			<artifactId>mybatis-plus</artifactId>
 			<version>3.3.0</version>
 		</dependency>
+		<!-- mybatis-plus-join -->
+		<dependency>
+			<groupId>com.github.yulichang</groupId>
+			<artifactId>mybatis-plus-join</artifactId>
+			<version>1.2.2</version>
+		</dependency>
 
 		<!-- https://mvnrepository.com/artifact/org.projectlombok/lombok-maven-plugin -->
 		<!-- <dependency> <groupId>org.projectlombok</groupId> <artifactId>lombok-maven-plugin</artifactId> 

src/main/java/cn/timer/api/controller/qyxx/CmsController.java

@@ -9,6 +9,7 @@ import java.util.TimerTask;
 import cn.timer.api.bean.qyxx.*;
 import cn.timer.api.dto.qyxx.CmsContentReadDto;
 import cn.timer.api.utils.redis.RedisUtil;
+import com.github.yulichang.query.MPJQueryWrapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
@@ -147,9 +148,13 @@ public class CmsController {
 		for (CmsContentModular cmsContentModular : list) {
 			// 分类模块id
 			Integer id = cmsContentModular.getId();
-			QueryWrapper<CmsContent> queryWrapper = new QueryWrapper<>();
-			queryWrapper.select("id", "modularid", "title", "author", "releasetime").eq("releasestate", 0)
-					.eq("organization_id", userBean.getOrgCode()).orderByDesc("releasetime").eq("modularid", id)
+			MPJQueryWrapper<CmsContent> queryWrapper = new MPJQueryWrapper<>();
+			queryWrapper.select("t.id", "t.modularid", "t.title", "t.author", "t.releasetime")
+					.leftJoin("cms_content_read ccr on t.id = ccr.cms_content_id");
+			queryWrapper.eq("t.releasestate", 0).and(!StringUtils.isEmpty(userBean.getEmpNum()), wq -> wq.eq("t.open_status", 1).or().and(true,q -> q.eq("t.open_status", 0).eq("ccr.user_id",userBean.getEmpNum())))
+
+					.eq("ccr.user_id", userBean.getEmpNum())
+					.eq("t.organization_id", userBean.getOrgCode()).orderByDesc("t.releasetime").eq("t.modularid", id)
 					.last("limit 5");
 			List<CmsContent> qynrs = CmsContent.builder().build().selectList(queryWrapper);
 			o.add(qynrs);

src/main/java/cn/timer/api/dao/qyxx/CmsContentMapper.java

 package cn.timer.api.dao.qyxx;
 
+import com.github.yulichang.base.MPJBaseMapper;
 import org.springframework.stereotype.Repository;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -12,6 +13,6 @@ import cn.timer.api.bean.qyxx.CmsContent;
  * @author dsc 2019-12-10
  */
 @Repository
-public interface CmsContentMapper extends BaseMapper<CmsContent> {
+public interface CmsContentMapper extends MPJBaseMapper<CmsContent> {
 
 }