Gitlink
/
microservices
0
1
Fork 12
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(知识库):我收藏的知识库筛选问题

This commit is contained in:
wanjia 2025-01-21 09:25:34 +08:00
parent 730b8b30ed
commit 1d99323465
5 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/controller/PmsDocumentUserFavoriteController.java
View File

@ -36,10 +36,10 @@ public class PmsDocumentUserFavoriteController extends BaseController
* 查询用户收藏文档列表
*/
@GetMapping("/list")
public GenericsTableDataInfo<PmsDocumentVo> list(PmsDocumentFavoriteSearchVo pmsDocumentFavoriteSearchVo)
public GenericsTableDataInfo<PmsDocumentVo> list(@PathVariable String enterpriseIdentifier, PmsDocumentFavoriteSearchVo pmsDocumentFavoriteSearchVo)
{
return pmsDocumentUserFavoriteService.selectPmsDocumentUserFavoriteList(pmsDocumentFavoriteSearchVo);
return pmsDocumentUserFavoriteService.selectPmsDocumentUserFavoriteList(enterpriseIdentifier, pmsDocumentFavoriteSearchVo);
}
/**

4
microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/domain/vo/PmsDocumentFavoriteSearchVo.java
View File

@ -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;
}

2
microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/service/IPmsDocumentUserFavoriteService.java
View File

@ -29,5 +29,5 @@ public interface IPmsDocumentUserFavoriteService
*/
public int deletePmsDocumentUserFavoriteByDocId(Long documentId);
GenericsTableDataInfo<PmsDocumentVo> selectPmsDocumentUserFavoriteList(PmsDocumentFavoriteSearchVo pmsDocumentFavoriteSearchVo);
GenericsTableDataInfo<PmsDocumentVo> selectPmsDocumentUserFavoriteList(String enterpriseIdentifier, PmsDocumentFavoriteSearchVo pmsDocumentFavoriteSearchVo);
}

8
microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/service/impl/PmsDocumentUserFavoriteServiceImpl.java
View File

@ -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<PmsDocumentVo> selectPmsDocumentUserFavoriteList(PmsDocumentFavoriteSearchVo pmsDocumentFavoriteSearchVo) {
public GenericsTableDataInfo<PmsDocumentVo> selectPmsDocumentUserFavoriteList(String enterpriseIdentifier, PmsDocumentFavoriteSearchVo pmsDocumentFavoriteSearchVo) {
pmsDocumentFavoriteSearchVo.setCurrentUserId(SecurityUtils.getUserId());
pmsDocumentFavoriteSearchVo.setPmsEnterpriseId(pmsEnterpriseService.selectPmsEnterpriseByIdentifier(enterpriseIdentifier).getId());
List<PmsDocument> pmsDocumentList = pmsDocumentMapper.selectPmsFavoriteDocumentList(pmsDocumentFavoriteSearchVo);
return toPage(pmsDocumentList,pmsDocumentService::buildPmsDocumentVo);
}

1
microservices-modules/microservices-modules-pms/src/main/resources/mapper/pms/PmsDocumentMapper.xml
View File

@ -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
<where>
pduf.user_id = #{currentUserId}
and pd.pms_enterprise_id = #{pmsEnterpriseId}
<if test="name != null and name != ''"> and pd.name like concat('%', #{name}, '%')</if>
<if test="docType != null "> and pd.doc_type = #{docType}</if>
${params.dataScope}