1

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/UserWithBeisenController.java

@@ -315,6 +315,7 @@ public class UserWithBeisenController {
                             }
                             if(a.getString("StaffId").equals(beisen.get().getUserId())
                                     && b
+                                    &&a.getString("DocumentType").equals("请假")
                                     &&  (a.getString("ApproveStatus").equals("通过") || a.getString("ApproveStatus").equals("审批中"))){
                                 return true;
                             }
@@ -565,6 +566,7 @@ public class UserWithBeisenController {
                     }
                     if(a.getString("StaffId").equals(beisen.get().getUserId())
                             && b
+                            &&a.getString("DocumentType").equals("请假")
                             &&  (a.getString("ApproveStatus").equals("通过") || a.getString("ApproveStatus").equals("审批中"))){
                         return true;
                     }

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/task/TimingTask.java

@@ -2421,6 +2421,7 @@ public class TimingTask {
                             }
                             if(a.getString("StaffId").equals(beisen.get().getUserId())
                                     && b
+                                    &&a.getString("DocumentType").equals("请假")
                                     &&  (a.getString("ApproveStatus").equals("通过") || a.getString("ApproveStatus").equals("审批中"))){
                                 return true;
                             }