Merge remote-tracking branch 'origin/feature-20240104' into feature-20240104

flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxClockLogServiceImpl.java

@@ -248,6 +248,7 @@ public class WxClockLogServiceImpl implements IWxClockLogService {
     public List<WxClockStatistics> clockStatistics(Integer year) {
         WxClockStatistics query = new WxClockStatistics();
         query.setYear(year);
+        query.setUserId(SecurityUtils.getLoginUser().getWxUserMember().getId());
         // 获取历史统计信息，数据在数据库
         List<WxClockStatistics> list = wxClockStatisticsMapper.selectWxClockStatisticsList(query);
         if (list != null && list.size() > 0 && year == LocalDate.now().getYear()) {