fix(系统设置): 用户及用户组搜索结果错误
--bug=1039115 --user=宋昌昌 【系统管理】用户/用户组列表搜索结果错误 https://www.tapd.cn/55049933/s/1517363
This commit is contained in:
parent
f42e9f274e
commit
47c6b0f7c3
|
@ -82,8 +82,9 @@
|
||||||
AND (
|
AND (
|
||||||
id = #{keyword} OR
|
id = #{keyword} OR
|
||||||
(name LIKE CONCAT('%', #{keyword}, '%')
|
(name LIKE CONCAT('%', #{keyword}, '%')
|
||||||
OR email LIKE CONCAT('%', #{keyword}, '%'))
|
OR email LIKE CONCAT('%', #{keyword}, '%')
|
||||||
)
|
OR phone LIKE CONCAT('%', #{keyword}, '%')
|
||||||
|
))
|
||||||
|
|
||||||
</if>
|
</if>
|
||||||
</select>
|
</select>
|
||||||
|
|
|
@ -33,6 +33,7 @@
|
||||||
and (
|
and (
|
||||||
u.name like concat('%', #{request.keyword},'%')
|
u.name like concat('%', #{request.keyword},'%')
|
||||||
or u.email like concat('%', #{request.keyword},'%')
|
or u.email like concat('%', #{request.keyword},'%')
|
||||||
|
or u.phone like concat('%', #{request.keyword},'%')
|
||||||
)
|
)
|
||||||
</if>
|
</if>
|
||||||
order by urr.create_time desc
|
order by urr.create_time desc
|
||||||
|
|
|
@ -364,9 +364,10 @@ public class TestPlanReportService {
|
||||||
public TestPlanReportDetailResponse edit(TestPlanReportDetailEditRequest request, String currentUser) {
|
public TestPlanReportDetailResponse edit(TestPlanReportDetailEditRequest request, String currentUser) {
|
||||||
TestPlanReport planReport = checkReport(request.getId());
|
TestPlanReport planReport = checkReport(request.getId());
|
||||||
TestPlanReportSummary reportSummary = new TestPlanReportSummary();
|
TestPlanReportSummary reportSummary = new TestPlanReportSummary();
|
||||||
reportSummary.setId(planReport.getId());
|
|
||||||
reportSummary.setSummary(request.getSummary());
|
reportSummary.setSummary(request.getSummary());
|
||||||
testPlanReportSummaryMapper.updateByPrimaryKeySelective(reportSummary);
|
TestPlanReportSummaryExample example = new TestPlanReportSummaryExample();
|
||||||
|
example.createCriteria().andTestPlanReportIdEqualTo(planReport.getId());
|
||||||
|
testPlanReportSummaryMapper.updateByExampleSelective(reportSummary, example);
|
||||||
// 处理富文本文件
|
// 处理富文本文件
|
||||||
transferRichTextTmpFile(request.getId(), planReport.getProjectId(), request.getRichTextTmpFileIds(), currentUser, TestPlanReportAttachmentSourceType.RICH_TEXT.name());
|
transferRichTextTmpFile(request.getId(), planReport.getProjectId(), request.getRichTextTmpFileIds(), currentUser, TestPlanReportAttachmentSourceType.RICH_TEXT.name());
|
||||||
return getReport(planReport.getId());
|
return getReport(planReport.getId());
|
||||||
|
|
Loading…
Reference in New Issue