ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(文档拆分、自定义对比): realname搜索

Browse Source
This commit is contained in:
yjz
2023-11-10 18:13:23 +08:00
parent c031c246c4
commit 0927a92d8b
4 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/laws/customcompare/mapper/xml/LawsCustomCompareInfoMapper.xml
+1
View File
@@ -29,6 +29,7 @@
) referenceCountry, ) referenceCountry,
is_show, is_show,
u.username username, u.username username,
u.realname realname,
concat(u.realname, '(', u.username, ')') author, concat(u.realname, '(', u.username, ')') author,
i.create_by, i.create_by,
i.create_time, i.create_time,
laws-modules/src/main/java/com/jero/modules/laws/customcompare/service/impl/LawsCustomCompareInfoServiceImpl.java
+1 -1
View File
@@ -111,7 +111,7 @@ public class LawsCustomCompareInfoServiceImpl extends ServiceImpl<LawsCustomComp
List<String> list = Arrays.asList(lawsCustomCompareInfoVO.getReferenceCountry().split(",")); List<String> list = Arrays.asList(lawsCustomCompareInfoVO.getReferenceCountry().split(","));
queryWrapper.and(qw -> list.forEach(v -> qw.or(iqw -> iqw.like("referenceCountry", v)))); 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()); queryWrapper.like(StringUtils.isNotBlank(lawsCustomCompareInfoVO.getIsShow()), "is_show", lawsCustomCompareInfoVO.getIsShow());
// 数据权限，默认只能查看公开的数据和操作人是当前登录人数据，管理员查看所有 // 数据权限，默认只能查看公开的数据和操作人是当前登录人数据，管理员查看所有
laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/xml/DocumentSplitMapper.xml
+1
View File
@@ -117,6 +117,7 @@
i.del_flag, i.del_flag,
publish_before_id, publish_before_id,
file_id, file_id,
u.realname as realname,
u.username as username u.username as username
from sar_file_split_info i from sar_file_split_info i
left join laws_domestic_standard s on i.standard_id = s.id and s.del_flag = 0 left join laws_domestic_standard s on i.standard_id = s.id and s.del_flag = 0
laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java
+1 -1
View File
@@ -1187,7 +1187,7 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService {
// 拆分状态 // 拆分状态
queryWrapper.eq(StringUtils.isNotBlank(documentSplitInfo.getSplitStatus()), "split_status", documentSplitInfo.getSplitStatus()); 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 // 发布前id
if (StringUtils.isNotBlank(documentSplitInfo.getPublishBeforeId())){ if (StringUtils.isNotBlank(documentSplitInfo.getPublishBeforeId())){
queryWrapper.eq("publish_before_id", documentSplitInfo.getPublishBeforeId()); queryWrapper.eq("publish_before_id", documentSplitInfo.getPublishBeforeId());