From 0927a92d8b46a8e331c85977818b3e3c17418753 Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Fri, 10 Nov 2023 18:13:23 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=96=87=E6=A1=A3=E6=8B=86=E5=88=86?= =?UTF-8?q?=E3=80=81=E8=87=AA=E5=AE=9A=E4=B9=89=E5=AF=B9=E6=AF=94):=20real?= =?UTF-8?q?name=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customcompare/mapper/xml/LawsCustomCompareInfoMapper.xml | 1 + .../service/impl/LawsCustomCompareInfoServiceImpl.java | 2 +- .../laws/documenttool/mapper/xml/DocumentSplitMapper.xml | 1 + .../documenttool/service/impl/DocumentSplitServiceImpl.java | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/mapper/xml/LawsCustomCompareInfoMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/customcompare/mapper/xml/LawsCustomCompareInfoMapper.xml index 972ddddd..648712c2 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/mapper/xml/LawsCustomCompareInfoMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/laws/customcompare/mapper/xml/LawsCustomCompareInfoMapper.xml @@ -29,6 +29,7 @@ ) referenceCountry, is_show, u.username username, + u.realname realname, concat(u.realname, '(', u.username, ')') author, i.create_by, i.create_time, diff --git a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/service/impl/LawsCustomCompareInfoServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/customcompare/service/impl/LawsCustomCompareInfoServiceImpl.java index 46866f03..8773a935 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/service/impl/LawsCustomCompareInfoServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/customcompare/service/impl/LawsCustomCompareInfoServiceImpl.java @@ -111,7 +111,7 @@ public class LawsCustomCompareInfoServiceImpl extends ServiceImpl list = Arrays.asList(lawsCustomCompareInfoVO.getReferenceCountry().split(",")); queryWrapper.and(qw -> list.forEach(v -> qw.or(iqw -> iqw.like("referenceCountry", v)))); } - queryWrapper.like(StringUtils.isNotBlank(lawsCustomCompareInfoVO.getAuthor()), "username", lawsCustomCompareInfoVO.getAuthor()); + queryWrapper.like(StringUtils.isNotBlank(lawsCustomCompareInfoVO.getAuthor()), "realname", lawsCustomCompareInfoVO.getAuthor()); queryWrapper.like(StringUtils.isNotBlank(lawsCustomCompareInfoVO.getIsShow()), "is_show", lawsCustomCompareInfoVO.getIsShow()); // 数据权限，默认只能查看公开的数据和操作人是当前登录人数据，管理员查看所有 diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/xml/DocumentSplitMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/xml/DocumentSplitMapper.xml index b667cd57..13647bd4 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/xml/DocumentSplitMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/xml/DocumentSplitMapper.xml @@ -117,6 +117,7 @@ i.del_flag, publish_before_id, file_id, + u.realname as realname, u.username as username from sar_file_split_info i left join laws_domestic_standard s on i.standard_id = s.id and s.del_flag = 0 diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java index 9dad83cf..7a129b51 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java @@ -1187,7 +1187,7 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService { // 拆分状态 queryWrapper.eq(StringUtils.isNotBlank(documentSplitInfo.getSplitStatus()), "split_status", documentSplitInfo.getSplitStatus()); // 编辑人 - queryWrapper.like(StringUtils.isNotBlank(documentSplitInfo.getAuthor()), "username", documentSplitInfo.getAuthor()); + queryWrapper.like(StringUtils.isNotBlank(documentSplitInfo.getAuthor()), "realname", documentSplitInfo.getAuthor()); // 发布前id if (StringUtils.isNotBlank(documentSplitInfo.getPublishBeforeId())){ queryWrapper.eq("publish_before_id", documentSplitInfo.getPublishBeforeId());