|
|
|
|
@ -323,7 +323,7 @@ public class WorkService extends ServiceImpl<WorkMapper, Work> {
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
// 排序
|
|
|
|
|
queryWrapper.orderByDesc("w.update_time"); |
|
|
|
|
queryWrapper.orderByDesc("m.mail_time"); |
|
|
|
|
Page<QueryMailVo> result = baseMapper.selectQueryPage(page, queryWrapper); |
|
|
|
|
for (QueryMailVo workVo : result.getRecords()) { |
|
|
|
|
List<MailLabel> labelNames = mailLabelMapper.selectList(null); |
|
|
|
|
@ -414,7 +414,7 @@ public class WorkService extends ServiceImpl<WorkMapper, Work> {
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
// 排序
|
|
|
|
|
queryWrapper.orderByDesc("w.update_time"); |
|
|
|
|
queryWrapper.orderByDesc("m.mail_time"); |
|
|
|
|
return baseMapper.selectQueryPage(page, queryWrapper); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|