yzc 1 рік тому
батько
коміт
d60e0693ef

+ 6 - 2
hx-form/src/main/java/com/fjhx/form/service/impl/EmployeeProductivityServiceImpl.java

@@ -48,13 +48,17 @@ public class EmployeeProductivityServiceImpl implements EmployeeProductivityServ
                 .in("t1.user_id", userIds)
                 .ge("t1.send_date", dto.getBeginTime())
                 .le("t1.send_date", dto.getEndTime())
-                .apply("t1.from_email != t1.mail_user"));
+                .apply("t1.from_email != t1.mail_user")
+                .groupBy("t1.user_id")
+        );
         //获取发邮件数列表
         List<EmailCount> sendEmailCount = employeeProductivityMapper.getUserEmailCount(IWrapper.getWrapper()
                 .in("t1.user_id", userIds)
                 .ge("t1.send_date", dto.getBeginTime())
                 .le("t1.send_date", dto.getEndTime())
-                .apply("t1.from_email = t1.mail_user"));
+                .apply("t1.from_email = t1.mail_user")
+                .groupBy("t1.user_id")
+        );
         DynamicDataSourceContextHolder.poll();
 
         Map<Long, Integer> receiveEmailCountMap = receiveEmailCount.stream().collect(Collectors.toMap(EmailCount::getUserId, EmailCount::getCount));