Explorar el Código

泓浒,不提醒人员不需要自动创建请假单

QuYueTing hace 2 semanas
padre
commit
1762a9996c

+ 2 - 2
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/task/DataCollectTask.java

@@ -329,8 +329,8 @@ public class DataCollectTask {
                                     //获取某人每天请假的时长合计
                                     String ownerId = tmp.getOwnerId();
                                     User owner = userMapper.selectById(ownerId);
-                                    //停用的用户不生成日报
-                                    if (owner.getIsActive() == 0) {
+                                    //停用的/不需要填写日报的用户不生成日报
+                                    if (owner.getIsActive() == 0 || owner.getReportStatus() == 1) {
                                         continue;
                                     }
                                     Project project = projectMapper.selectOne(new QueryWrapper<Project>().eq("project_code", "HH-QJ-0000001").eq("company_id", specialCompanyId));