填报及时率修改 部门bug 修改

资源需求按人员查看 请假修改

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ProjectServiceImpl.java

@@ -1706,9 +1706,25 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                     }
                     curItem.id = "请假_"+leaveSheetList.get(i).getId();
                     curItem.userId = leaveSheetList.get(i).getOwnerId();
-                    curItem.text = "请假";
+                    switch (leaveSheetList.get(i).getLeaveType()){
+                        case 1:curItem.text = "病假";
+                            break;
+                        case 2:curItem.text = "年假";
+                            break;
+                        case 3:curItem.text = "产假";
+                            break;
+                        case 4:curItem.text = "婚假";
+                            break;
+                        case 5:curItem.text = "丧家";
+                            break;
+                        case 6:curItem.text = "调休假";
+                            break;
+                        case 7:curItem.text = "陪产假";
+                            break;
+                        case 8:curItem.text = "其他";
+                            break;
+                    }
                     curItem.start_date = leaveSheetList.get(i).getStartDate().toString();
-
                     curItem.end_date =leaveSheetList.get(i).getEndDate().toString();
                     curItem.parent = lsLastItemId;
                     itemList.add(curItem);
@@ -3415,7 +3431,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         if(userId!=null){
             queryWrapper.eq("id",userId);
         }
-        if(deptIds!=null){
+        if(deptIds!=null && deptIds.size()>0){
             queryWrapper.in("department_id",deptIds);
         }
         queryWrapper.eq("is_active",1).orderByAsc("department_id");