里程碑的排序

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

@@ -610,7 +610,7 @@ public class TaskController {
         String userId = request.getHeader("Token");
 
         QueryWrapper<Task> queryWrapper = new QueryWrapper<Task>().eq("project_id", projectId).eq("task_type", 1);
-        queryWrapper.orderByAsc("end_date");
+        queryWrapper.orderByAsc("end_date is null").orderByAsc("end_date");
         msg.data = taskService.list(queryWrapper);
         return msg;
     }

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

@@ -215,12 +215,10 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                     map.put("reportTime", df.format(reportTime));
                     map.put("cost", total);
                     map.put("state", state);
-                    System.out.println("===========自己的=========");
                 }
                 List<Integer> allVisibleDeptIdList = getAllVisibleDeptIdList(user, null);
                 //需要看可见部门（部门主要负责人和其他负责人以及查看本部门工时权限）所有人员的日报
                 if (allVisibleDeptIdList.size() > 0) {
-                    System.out.println("有可见部门");
                     for (Integer ids : allVisibleDeptIdList) {
                         System.out.println(ids);
                     }