Browse Source

修复不满意信件SQL条件拼接错误

master
21819 2 years ago
parent
commit
b6c8b5671d
  1. 8
      mailbox-lan/src/main/java/com/biutag/lan/service/WorkService.java

8
mailbox-lan/src/main/java/com/biutag/lan/service/WorkService.java

@ -362,9 +362,9 @@ public class WorkService extends ServiceImpl<WorkMapper, Work> {
} }
private void mailCategorySearch(MailQuery mailQuery, QueryWrapper<Mail> queryWrapper) { private void mailCategorySearch(MailQuery mailQuery, QueryWrapper<Mail> queryWrapper) {
if(StrUtil.isNotBlank(mailQuery.getMailCategory())){ if (StrUtil.isNotBlank(mailQuery.getMailCategory())) {
MailCategory mailCategory = mailCategoryMapper.selectById(mailQuery.getMailCategory()); MailCategory mailCategory = mailCategoryMapper.selectById(mailQuery.getMailCategory());
switch (mailCategory.getLevel()){ switch (mailCategory.getLevel()) {
case 1: case 1:
queryWrapper.eq("m.mail_first_category", mailCategory.getName()); queryWrapper.eq("m.mail_first_category", mailCategory.getName());
break; break;
@ -413,9 +413,7 @@ public class WorkService extends ServiceImpl<WorkMapper, Work> {
.eq(StrUtil.isNotBlank(mailQuery.getSource()), "m.source", mailQuery.getSource()) .eq(StrUtil.isNotBlank(mailQuery.getSource()), "m.source", mailQuery.getSource())
.eq(StrUtil.isNotBlank(mailQuery.getMailLevel()), "m.mail_level", mailQuery.getMailLevel()) .eq(StrUtil.isNotBlank(mailQuery.getMailLevel()), "m.mail_level", mailQuery.getMailLevel())
// .eq(StrUtil.isNotBlank(todoQuery.getAppealState()), "m.appeal_state", todoQuery.getAppealState()) // .eq(StrUtil.isNotBlank(todoQuery.getAppealState()), "m.appeal_state", todoQuery.getAppealState())
.eq("m.satisfaction_status", "不满意") .and(qw -> qw.eq("m.satisfaction_status", "不满意").or().eq("m.verify_feedback", "不满意"));
.or()
.eq("m.verify_feedback", "不满意");
mailCategorySearch(mailQuery, queryWrapper); mailCategorySearch(mailQuery, queryWrapper);
deptSearch(mailQuery, queryWrapper); deptSearch(mailQuery, queryWrapper);
roleCheck(queryWrapper); roleCheck(queryWrapper);

Loading…
Cancel
Save