From 0125100f9784c425e754ac8ca01a8e6a619eda29 Mon Sep 17 00:00:00 2001 From: liao Date: Mon, 25 Sep 2023 14:55:55 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=A0=87=E5=87=86=E6=B3=95=E8=A7=84-?= =?UTF-8?q?=E6=88=91=E7=9A=84=E6=94=B6=E8=97=8F=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/laws/common/constant/FieldCommon.java | 2 ++ .../common/service/impl/LawsCommonServiceImpl.java | 10 ++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/constant/FieldCommon.java b/laws-modules/src/main/java/com/jero/modules/laws/common/constant/FieldCommon.java index 9e096d9e..d621f394 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/constant/FieldCommon.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/constant/FieldCommon.java @@ -57,6 +57,8 @@ public class FieldCommon { public static final String STR_TO_DATE_SUFFIX = "','%Y-%m-%d %H:%i:%s')"; // 格式化时间格式的后缀 // 收藏标识 public static final String COLLECTION_FLAG = "collectionFlag"; + // 我的收藏 + public static final String MY_COLLECTION = "MyCollection"; // 主键 public static final String ID = "id"; // 标准编号 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 a1c06d88..78df539f 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 @@ -1359,8 +1359,14 @@ public class LawsCommonServiceImpl implements ILawsCommonService { // 处理左侧树code查询 String nodeCode = (String) parameterMap.get(FieldCommon.NODE_CODE); // 获取树节点code if (StringUtils.isNotBlank(nodeCode) && nodeCode.length() > 3) { - selectCondition.append(" and id in (select unique_relation_flag from laws_node_relation " + - "where node_code like concat('" + nodeCode + "','%'))"); + if (FieldCommon.MY_COLLECTION.equals(nodeCode)) { + LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + selectCondition.append(" and id in (select distinct standard_id from laws_standard_collection" + + " where collector_id = '"+ loginUser.getId() +"')"); + } else { + selectCondition.append(" and id in (select distinct unique_relation_flag from laws_node_relation " + + "where node_code like concat('" + nodeCode + "','%'))"); + } } //处理列表表头排序