From a6a6f89f31e9de4b3b5eb09972ff2d939cd2bbf5 Mon Sep 17 00:00:00 2001 From: 21819 Date: Wed, 13 Mar 2024 21:51:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=B2=E5=8A=9E=E5=92=8C=E4=BB=A3=E5=8A=9E?= =?UTF-8?q?=E4=BF=A1=E4=BB=B6=E5=88=86=E7=B1=BB=E6=90=9C=E7=B4=A0=E4=BB=A5?= =?UTF-8?q?=E5=8F=8A=E4=BF=A1=E4=BB=B6=E7=8A=B6=E6=80=81=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/biutag/lan/service/WorkService.java | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/mailbox-lan/src/main/java/com/biutag/lan/service/WorkService.java b/mailbox-lan/src/main/java/com/biutag/lan/service/WorkService.java index 36b9649..de3c392 100644 --- a/mailbox-lan/src/main/java/com/biutag/lan/service/WorkService.java +++ b/mailbox-lan/src/main/java/com/biutag/lan/service/WorkService.java @@ -224,13 +224,28 @@ public class WorkService extends ServiceImpl { .le(StrUtil.isNotBlank(todoQuery.getMailTimeStartEnd()), "TO_CHAR(m.mail_time, 'YYYY-MM-DD')", todoQuery.getMailTimeStartEnd()) .eq(StrUtil.isNotBlank(todoQuery.getSource()), "m.source", todoQuery.getSource()) .eq(StrUtil.isNotBlank(todoQuery.getMailLevel()), "m.mail_level", todoQuery.getMailLevel()) - .eq(StrUtil.isNotBlank(todoQuery.getMailCategory()), "m.mail_category", todoQuery.getMailCategory()) +// .eq(StrUtil.isNotBlank(todoQuery.getMailCategory()), "m.mail_category", todoQuery.getMailCategory()) + .eq(StrUtil.isNotBlank(todoQuery.getMailState()), "m.mail_state", todoQuery.getMailState()) .like(StrUtil.isNotBlank(todoQuery.getThreeDeptName()), "m.three_dept_name", todoQuery.getThreeDeptName()) .eq(StrUtil.isNotBlank(todoQuery.getFlowKey()), "m.flow_key", todoQuery.getFlowKey()) .and(query -> { query.isNull("m.flow_key").or().ne("m.flow_key", FlowNodeEnum.COMPLETION.getKey()); }); deptWorkSearch(todoQuery, queryWrapper); + if (StrUtil.isNotBlank(todoQuery.getMailCategory())) { + MailCategory mailCategory = mailCategoryMapper.selectById(todoQuery.getMailCategory()); + switch (mailCategory.getLevel()) { + case 1: + queryWrapper.eq("m.mail_first_category", mailCategory.getName()); + break; + case 2: + queryWrapper.eq("m.mail_second_category", mailCategory.getName()); + break; + case 3: + queryWrapper.eq("m.mail_three_category", mailCategory.getName()); + break; + } + } Integer roleId = AdminThreadLocal.getRoleId(); Integer deptId = AdminThreadLocal.getDeptId();