From 149fdb4957b434690e210a5c7e26abba177626df Mon Sep 17 00:00:00 2001 From: caihaohan Date: Fri, 13 Sep 2024 16:19:17 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=AF=A6=E6=83=85=E9=A1=B5=E5=8A=A0?= =?UTF-8?q?=E6=94=B6=E8=97=8F=E6=A0=87=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/LawsCommonServiceImpl.java | 38 +++++++++++++++++-- 1 file changed, 35 insertions(+), 3 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java index 4bd74645..c32fd67a 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java @@ -457,6 +457,36 @@ public class LawsCommonServiceImpl implements ILawsCommonService { * @Date: 2023/9/11 14:49 * @Description: 是否收藏标识判断 **/ + private void collectionFlag(Map stringObjectMap) { + // 获取全部id集合 + String id = String.valueOf(stringObjectMap.get("id")); + if (StrUtil.isBlank(id)) return; + // 获取登录用户 + LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + // 查询标准收藏表 + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(LawsStandardCollection::getCollectorId, loginUser.getId()); + queryWrapper.eq(LawsStandardCollection::getStandardId, id); + List standardCollectionList = lawsStandardCollectionService.list(queryWrapper); + if (CollectionUtils.isEmpty(standardCollectionList)) { + stringObjectMap.put(FieldCommon.COLLECTION_FLAG, false); + return; + } + List standardIdList = standardCollectionList.stream() + .map(LawsStandardCollection::getStandardId).collect(Collectors.toList()); + if (standardIdList.contains(id)) { + stringObjectMap.put(FieldCommon.COLLECTION_FLAG, true); + } else { + stringObjectMap.put(FieldCommon.COLLECTION_FLAG, false); + } + } + + + /** + * @Author: liao + * @Date: 2023/9/11 14:49 + * @Description: 标准详情是否收藏标识 + **/ private void collectionFlag(List> records) { // 获取全部id集合 List ids = records.stream().map(kv -> @@ -1225,6 +1255,8 @@ public class LawsCommonServiceImpl implements ILawsCommonService { splitFlag(stringObjectMap); // 添加固定字段 this.setFixedUserInfo(stringObjectMap, singleStandard); + // 标准收藏标识 + collectionFlag(stringObjectMap); // 对返回的字段做处理 return stringObjectMap; } @@ -1293,16 +1325,16 @@ public class LawsCommonServiceImpl implements ILawsCommonService { List nodeCode = lawsTreeNodeList.stream() .map(LawsTreeNode::getNodeCode).collect(Collectors.toList()); LambdaQueryWrapper query = new LambdaQueryWrapper<>(); - query.and(o->{ + query.and(o -> { for (int i = 0; i < nodeCode.size(); i++) { o.likeRight(LawsNodeRelation::getNodeCode, nodeCode.get(i)); - if(i != (nodeCode.size() - 1)){ + if (i != (nodeCode.size() - 1)) { o.or(); } } }); List lawsNodeRelationListAll = lawsNodeRelationService.list(query); - if(!CollectionUtils.isEmpty(lawsNodeRelationListAll)){ + if (!CollectionUtils.isEmpty(lawsNodeRelationListAll)) { String ids = lawsNodeRelationListAll.stream().map(LawsNodeRelation::getUniqueRelationFlag) .collect(Collectors.joining(",")); selectionBoxVO.setIds(ids);