1.修改子项目工时统计

src/main/java/com/galaxis/manatee/dao/ChuanyunSubWorkHourDao.java

@@ -26,7 +26,7 @@ public interface ChuanyunSubWorkHourDao extends GalaxisRepository<ChuanyunSubWor
             "\tchuanyun_day_log.project_type,\n" +
             "\tchuanyun_log.user_id,\n" +
             "\tchuanyun_log.department_name,\n" +
-            "  chuanyun_day_log.sub_project_bg AS bg,\n" +
+            "\tchuanyun_day_log.sub_project_bg AS bg,\n" +
             "\tchuanyun_log. STATUS,\n" +
             "\tchuanyun_day_log.day_log_date\n" +
             "FROM\n" +
@@ -34,8 +34,8 @@ public interface ChuanyunSubWorkHourDao extends GalaxisRepository<ChuanyunSubWor
             "LEFT JOIN chuanyun_log ON chuanyun_day_log.parent_object_id = chuanyun_log.object_id\n" +
             "WHERE\n" +
             "\tchuanyun_log.user_id = ?\n" +
-            "AND chuanyun_day_log.sub_porject_id IS NOT NULL\n" +
-            "AND chuanyun_day_log.sub_project_bg IS NOT NULL\n" +
+            "AND chuanyun_day_log.sub_porject_id != '' && chuanyun_day_log.sub_porject_id IS NOT NULL\n" +
+            "AND chuanyun_day_log.sub_project_bg != '' && chuanyun_day_log.sub_project_bg IS NOT NULL\n" +
             "GROUP BY\n" +
             "\tchuanyun_day_log.sub_porject_id,\n" +
             "\tchuanyun_log.user_id,\n" +