fix(文档拆分、自定义对比): realname搜索
This commit is contained in:
+1
@@ -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,
|
||||
|
||||
+1
-1
@@ -111,7 +111,7 @@ public class LawsCustomCompareInfoServiceImpl extends ServiceImpl<LawsCustomComp
|
||||
List<String> 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());
|
||||
|
||||
// 数据权限,默认只能查看公开的数据和操作人是当前登录人数据,管理员查看所有
|
||||
|
||||
+1
@@ -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
|
||||
|
||||
+1
-1
@@ -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());
|
||||
|
||||
Reference in New Issue
Block a user