diff --git a/mailbox-lan/src/main/java/com/biutag/lan/domain/vo/QueryMailVo.java b/mailbox-lan/src/main/java/com/biutag/lan/domain/vo/QueryMailVo.java index 144ceed..e3f13bd 100644 --- a/mailbox-lan/src/main/java/com/biutag/lan/domain/vo/QueryMailVo.java +++ b/mailbox-lan/src/main/java/com/biutag/lan/domain/vo/QueryMailVo.java @@ -116,4 +116,12 @@ public class QueryMailVo { * 现在登陆的部门 */ private Integer nowDeptId; + /** + * 是否显示立即处理按钮 + */ + private Integer ifHandle; + /** + * 当前处理步骤 + */ + private String step; } 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 ef699f9..7da1b70 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 @@ -479,6 +479,23 @@ public class WorkService extends ServiceImpl { Page result = baseMapper.selectDissatisfiedPage(page, queryWrapper); for (QueryMailVo workVo : result.getRecords()) { workVo.setNowDeptId(AdminThreadLocal.getDeptId()); + workVo.setIfHandle(0); + //如果step为null则赋值”0“ + if (workVo.getStep() == null) { + workVo.setStep("0"); + } + switch (workVo.getStep()) { + case "1": + if (AdminThreadLocal.getRoleId().equals(2)) { + workVo.setIfHandle(1); + } + break; + case "2": + if (AdminThreadLocal.getRoleId().equals(1)) { + workVo.setIfHandle(1); + } + break; + } } return result; } diff --git a/mailbox-lan/src/main/resources/mapper/WorkMapper.xml b/mailbox-lan/src/main/resources/mapper/WorkMapper.xml index d2d27c1..8074494 100644 --- a/mailbox-lan/src/main/resources/mapper/WorkMapper.xml +++ b/mailbox-lan/src/main/resources/mapper/WorkMapper.xml @@ -57,7 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"