Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/smart_sc...

liujie

2026-01-28 a1bd915740533c7eec7ef64015b28ba6b815374a

Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/smart_screen

 ruoyi-system/src/main/java/com/ruoyi/system/service/ProjectCategoryCalculator.java

@@ -558,10 +558,10 @@
                            break;
                        }
                    }

                    if (!matchesRule) {
                        break;
                    }
                    //短路与开关
                    // if (!matchesRule) {
                    //     break;
                    // }
                }

                if (matchesRule) {

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ClientServiceImpl.java

@@ -109,6 +109,8 @@
            // 1. 先查询符合条件的 Task
            LambdaQueryWrapper<Task> taskWrapper = new LambdaQueryWrapper<>();
            taskWrapper.in(Task::getProjectId, projectIds)
                    .ge(Task::getDate, monthStart.toInstant().atZone(ZoneId.systemDefault()).toLocalDate())
                    .le(Task::getDate, monthEnd.toInstant().atZone(ZoneId.systemDefault()).toLocalDate())
                    .eq(Task::getDeleted, false);
            List<Task> tasks = taskMapper.selectList(taskWrapper);