优化完善

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

@@ -684,23 +684,26 @@ public class WorkService extends ServiceImpl<WorkMapper, Work> {
             if (workVo.getStep() == null) {
                 workVo.setStep("0");
             }
-            switch (workVo.getStep()) {
-                case "1":
-                    if (AdminThreadLocal.getRoleId().equals(RoleEnum.SECOND_DEPT_CLASSES.getRoleId())) {
-                        workVo.setIfHandle(1);
-                    }
-                    break;
-                case "2":
-                    if (AdminThreadLocal.getRoleId().equals(RoleEnum.MUNICIPAL_DEPT_CLASSES.getRoleId())) {
-                        workVo.setIfHandle(1);
-                    }
-                    break;
-                case "3":
-                    if (AdminThreadLocal.getRoleId().equals(RoleEnum.MUNICIPAL_CLASSES_LEADER.getRoleId()) && AdminThreadLocal.getEmpNo().equals(workVo.getFirstLeaderEmpNo())) {
-                        workVo.setIfHandle(1);
-                    }
-                    break;
+            if (AppealState.ON_APPEAL.getValue().equals(workVo.getAppealState())) {
+                switch (workVo.getStep()) {
+                    case "1":
+                        if (AdminThreadLocal.getRoleId().equals(RoleEnum.SECOND_DEPT_CLASSES.getRoleId())) {
+                            workVo.setIfHandle(1);
+                        }
+                        break;
+                    case "2":
+                        if (AdminThreadLocal.getRoleId().equals(RoleEnum.MUNICIPAL_DEPT_CLASSES.getRoleId())) {
+                            workVo.setIfHandle(1);
+                        }
+                        break;
+                    case "3":
+                        if (AdminThreadLocal.getRoleId().equals(RoleEnum.MUNICIPAL_CLASSES_LEADER.getRoleId()) && AdminThreadLocal.getEmpNo().equals(workVo.getFirstLeaderEmpNo())) {
+                            workVo.setIfHandle(1);
+                        }
+                        break;
+                }
             }
+
         }
         return result;
     }
@@ -715,7 +718,8 @@ public class WorkService extends ServiceImpl<WorkMapper, Work> {
                 .eq(StrUtil.isNotBlank(mailQuery.getMailLevel()), "m.mail_level", mailQuery.getMailLevel())
                 .and(query -> {
                     query.eq("mm.satisfied", AppConstants.FALSE).or().eq("ma.appeal_state", AppealState.SUCCESS.getValue());
-                });
+                })
+                .eq("ma.appeal_state", AppealState.ON_APPEAL.getValue());
         if (StrUtil.isNotBlank(mailQuery.getAppealState())) {
             if (mailQuery.getAppealState().equals(AppealState.UN_APPEAL.getValue()))
                 queryWrapper.nested(q -> q.eq("ma.appeal_state", AppealState.UN_APPEAL.getValue()).or().isNull("ma.appeal_state"));