diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/controller/PmsDocumentUserFavoriteController.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/controller/PmsDocumentUserFavoriteController.java index 76a0594ab..778b174ef 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/controller/PmsDocumentUserFavoriteController.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/controller/PmsDocumentUserFavoriteController.java @@ -36,10 +36,10 @@ public class PmsDocumentUserFavoriteController extends BaseController * 查询用户收藏文档列表 */ @GetMapping("/list") - public GenericsTableDataInfo list(PmsDocumentFavoriteSearchVo pmsDocumentFavoriteSearchVo) + public GenericsTableDataInfo list(@PathVariable String enterpriseIdentifier, PmsDocumentFavoriteSearchVo pmsDocumentFavoriteSearchVo) { - return pmsDocumentUserFavoriteService.selectPmsDocumentUserFavoriteList(pmsDocumentFavoriteSearchVo); + return pmsDocumentUserFavoriteService.selectPmsDocumentUserFavoriteList(enterpriseIdentifier, pmsDocumentFavoriteSearchVo); } /** diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/domain/vo/PmsDocumentFavoriteSearchVo.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/domain/vo/PmsDocumentFavoriteSearchVo.java index 2cbc5ed6a..06cc2e80b 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/domain/vo/PmsDocumentFavoriteSearchVo.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/domain/vo/PmsDocumentFavoriteSearchVo.java @@ -30,4 +30,8 @@ public class PmsDocumentFavoriteSearchVo extends BaseEntity @JsonIgnore @ApiModelProperty(value = "用户id", hidden = true) private Long currentUserId; + + @JsonIgnore + @ApiModelProperty(value = "企业id", hidden = true) + private Long pmsEnterpriseId; } diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/service/IPmsDocumentUserFavoriteService.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/service/IPmsDocumentUserFavoriteService.java index 2f3abcd00..a44b5ed8f 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/service/IPmsDocumentUserFavoriteService.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/service/IPmsDocumentUserFavoriteService.java @@ -29,5 +29,5 @@ public interface IPmsDocumentUserFavoriteService */ public int deletePmsDocumentUserFavoriteByDocId(Long documentId); - GenericsTableDataInfo selectPmsDocumentUserFavoriteList(PmsDocumentFavoriteSearchVo pmsDocumentFavoriteSearchVo); + GenericsTableDataInfo selectPmsDocumentUserFavoriteList(String enterpriseIdentifier, PmsDocumentFavoriteSearchVo pmsDocumentFavoriteSearchVo); } diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/service/impl/PmsDocumentUserFavoriteServiceImpl.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/service/impl/PmsDocumentUserFavoriteServiceImpl.java index feef7cdc4..1559f0df0 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/service/impl/PmsDocumentUserFavoriteServiceImpl.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/service/impl/PmsDocumentUserFavoriteServiceImpl.java @@ -11,6 +11,8 @@ import com.microservices.pms.document.domain.vo.PmsDocumentVo; import com.microservices.pms.document.mapper.PmsDocumentMapper; import com.microservices.pms.document.mapper.PmsDocumentUserFavoriteMapper; import com.microservices.pms.document.service.IPmsDocumentUserFavoriteService; +import com.microservices.pms.enterprise.service.IPmsEnterpriseService; +import com.microservices.pms.enterprise.service.impl.PmsEnterpriseServiceImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -36,6 +38,9 @@ public class PmsDocumentUserFavoriteServiceImpl implements IPmsDocumentUserFavor @Autowired private PmsDocumentServiceImpl pmsDocumentService; + @Autowired + private IPmsEnterpriseService pmsEnterpriseService; + /** * 新增用户收藏文档 * @@ -67,8 +72,9 @@ public class PmsDocumentUserFavoriteServiceImpl implements IPmsDocumentUserFavor } @Override - public GenericsTableDataInfo selectPmsDocumentUserFavoriteList(PmsDocumentFavoriteSearchVo pmsDocumentFavoriteSearchVo) { + public GenericsTableDataInfo selectPmsDocumentUserFavoriteList(String enterpriseIdentifier, PmsDocumentFavoriteSearchVo pmsDocumentFavoriteSearchVo) { pmsDocumentFavoriteSearchVo.setCurrentUserId(SecurityUtils.getUserId()); + pmsDocumentFavoriteSearchVo.setPmsEnterpriseId(pmsEnterpriseService.selectPmsEnterpriseByIdentifier(enterpriseIdentifier).getId()); List pmsDocumentList = pmsDocumentMapper.selectPmsFavoriteDocumentList(pmsDocumentFavoriteSearchVo); return toPage(pmsDocumentList,pmsDocumentService::buildPmsDocumentVo); } diff --git a/microservices-modules/microservices-modules-pms/src/main/resources/mapper/pms/PmsDocumentMapper.xml b/microservices-modules/microservices-modules-pms/src/main/resources/mapper/pms/PmsDocumentMapper.xml index 8a39b39f2..36ad6adc6 100644 --- a/microservices-modules/microservices-modules-pms/src/main/resources/mapper/pms/PmsDocumentMapper.xml +++ b/microservices-modules/microservices-modules-pms/src/main/resources/mapper/pms/PmsDocumentMapper.xml @@ -95,6 +95,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join pms_document_user_favorite as pduf on pduf.pms_document_id = pd.id pduf.user_id = #{currentUserId} + and pd.pms_enterprise_id = #{pmsEnterpriseId} and pd.name like concat('%', #{name}, '%') and pd.doc_type = #{docType} ${params.dataScope}