From 2500482e1b624d41bf32ac801956da4b337125fe Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Sun, 25 Apr 2021 09:24:07 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=A7=AF=E5=88=86=E8=A1=8C?=
 =?UTF-8?q?=E4=B8=BA=E8=AE=B0=E5=BD=95=E6=95=B0=E6=8D=AE=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0sourceType=EF=BC=8C=E5=A1=AB?=
 =?UTF-8?q?=E5=85=85sourceId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/service/impl/BizPointTotalDetailServiceImpl.java    | 4 +++-
 .../com/epmet/service/impl/UserPointActionLogServiceImpl.java | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/BizPointTotalDetailServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/BizPointTotalDetailServiceImpl.java
index 6609bbe34c..282ae423aa 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/BizPointTotalDetailServiceImpl.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/BizPointTotalDetailServiceImpl.java
@@ -41,6 +41,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.text.Collator;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
@@ -195,7 +196,8 @@ public class BizPointTotalDetailServiceImpl extends BaseServiceImpl<BizPointTota
 
         }));
         list =
-                list.stream().sorted(Comparator.comparing(GroupPointRankingResultDTO :: getPoint, Comparator.comparingInt(Integer::parseInt)).reversed().thenComparing(GroupPointRankingResultDTO::getGroupName))
+                list.stream().sorted(Comparator.comparing(GroupPointRankingResultDTO :: getPoint, Comparator.comparingInt(Integer::parseInt)).reversed()
+                        .thenComparing(GroupPointRankingResultDTO::getGroupName, Collator.getInstance(Locale.CHINA)))
                 .collect(Collectors.toList());
         AtomicInteger i = new AtomicInteger(1);
         list.forEach(dto -> {
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java
index 736ca73451..9894e90d80 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java
@@ -427,6 +427,7 @@ public class UserPointActionLogServiceImpl extends BaseServiceImpl<UserPointActi
         action.setCreatedBy(grantPoint.getOperatorId());
         action.setUpdatedBy(grantPoint.getOperatorId());
         action.setSourceId(grantPoint.getSourceId());
+        action.setSourceType("activity");
         action.setOperatorAgencyId(grantPoint.getOpAgencyId());
         baseDao.insert(action);
         //2.新增/修改用户积分日统计