From 5deb79d150e5ebe818896b0fd2ab41c57008e4a3 Mon Sep 17 00:00:00 2001 From: 21819 Date: Wed, 13 Mar 2024 16:55:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=89=94=E9=99=A4=E4=B8=93=E7=8F=AD=E5=85=B1?= =?UTF-8?q?=E4=BA=AB=E8=B4=A6=E5=8F=B7;=20=E4=BF=A1=E4=BB=B6=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=B7=B2=E7=BB=88=E6=AD=A2=E6=9F=A5=E8=AF=A2=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/biutag/lan/service/WorkService.java | 34 +++++++++---------- .../service/impl/PoliceUserServiceImpl.java | 1 + 2 files changed, 18 insertions(+), 17 deletions(-) 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 582c223..36b9649 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 @@ -357,27 +357,27 @@ public class WorkService extends ServiceImpl { .le(StrUtil.isNotBlank(mailQuery.getMailTimeStartEnd()), "TO_CHAR(m.mail_time, 'YYYY-MM-DD')", mailQuery.getMailTimeStartEnd()) .eq(StrUtil.isNotBlank(mailQuery.getSource()), "m.source", mailQuery.getSource()) .eq(StrUtil.isNotBlank(mailQuery.getMailLevel()), "m.mail_level", mailQuery.getMailLevel()) -// .eq(StrUtil.isNotBlank(mailQuery.getMailState()), "m.mail_state", mailQuery.getMailState()) + .eq(StrUtil.isNotBlank(mailQuery.getMailState()), "m.mail_state", mailQuery.getMailState()) .eq(Objects.nonNull(mailQuery.getSignRoleId()), "w.sign_role_id", mailQuery.getSignRoleId()) .eq(Objects.nonNull(mailQuery.getSignDeptId()), "w.sign_dept_id", mailQuery.getSignDeptId()); //剔除终止操作的信件类别方便统计 - if (StrUtil.isNotBlank(mailQuery.getMailState())) { - switch (mailQuery.getMailState()) { - case "terminated": - queryWrapper.nested(i -> i.eq("m.mail_first_category", "终止类") - .or().eq("m.mail_first_category", "感谢信类") - .or().eq("m.mail_first_category", "无效类")); - break; - case "completion": - queryWrapper.ne("m.mail_first_category", "终止类") - .ne("m.mail_first_category", "感谢信类") - .ne("m.mail_first_category", "无效类"); - break; - default: - queryWrapper.eq("m.mail_state", mailQuery.getMailState()); - } - } +// if (StrUtil.isNotBlank(mailQuery.getMailState())) { +// switch (mailQuery.getMailState()) { +// case "terminated": +// queryWrapper.nested(i -> i.eq("m.mail_first_category", "终止类") +// .or().eq("m.mail_first_category", "感谢信类") +// .or().eq("m.mail_first_category", "无效类")); +// break; +// case "completion": +// queryWrapper.ne("m.mail_first_category", "终止类") +// .ne("m.mail_first_category", "感谢信类") +// .ne("m.mail_first_category", "无效类"); +// break; +// default: +// queryWrapper.eq("m.mail_state", mailQuery.getMailState()); +// } +// } if (StrUtil.isNotBlank(mailQuery.getFlowKey())) { List flowKeyList = StrUtil.split(mailQuery.getFlowKey(), ',', true, true); diff --git a/mailbox-lan/src/main/java/com/biutag/lan/service/impl/PoliceUserServiceImpl.java b/mailbox-lan/src/main/java/com/biutag/lan/service/impl/PoliceUserServiceImpl.java index 7ad072e..e632a1a 100644 --- a/mailbox-lan/src/main/java/com/biutag/lan/service/impl/PoliceUserServiceImpl.java +++ b/mailbox-lan/src/main/java/com/biutag/lan/service/impl/PoliceUserServiceImpl.java @@ -116,6 +116,7 @@ public class PoliceUserServiceImpl implements IPoliceUserService { "t.post_ids as post,t.role_ids as role,t.dept_ids as dept,t.is_multipoint,t.mobile,t.id_code,t.job,t.job_type," + "t.is_disable,t.last_login_ip,t.last_login_time,t.create_time,t.update_time") .eq("t.is_delete", 0) + .apply("t.emp_no !~ '[\\u4e00-\\u9fa5]'")//剔除专班共享账号 .orderByDesc(Arrays.asList("t.id", "t.sort"));