From 2f4337fdba44524beebebdfe597804b8fb7bf930 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 27 May 2021 16:29:19 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=BF=90=E8=90=A5=E7=AB=AF=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E5=B0=8F=E7=A8=8B=E5=BA=8F=E8=8D=89=E7=A8=BF=E7=AE=B1?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=AE=BE=E7=BD=AE=E6=8C=89=E8=8D=89=E7=A8=BF?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4=E9=99=8D=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/CodeServiceImpl.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java index a45dc77644..89e72048cf 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java @@ -779,6 +779,15 @@ public class CodeServiceImpl implements CodeService { dto.setCreateTime(DateUtils.formatTimestamp(temp.getCreateTime(), DateUtils.DATE_TIME_PATTERN)); resultList.add(dto); }); + //按时间降序 + if (resultList.size() > NumConstant.ZERO) { + Collections.sort(resultList, new Comparator() { + @Override + public int compare(TemplateDraftListResultDTO o1, TemplateDraftListResultDTO o2) { + return o2.getCreateTime().compareTo(o1.getCreateTime()); + } + }); + } return resultList; } From de7694f05bb406f55a89af327caccd8f9994a7e4 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 28 May 2021 09:27:10 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=97=A5=E5=BF=97bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/wxapi/service/impl/WxLoginServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/impl/WxLoginServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/impl/WxLoginServiceImpl.java index 90cb5b5b4d..5cec27354e 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/impl/WxLoginServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/impl/WxLoginServiceImpl.java @@ -41,7 +41,7 @@ public class WxLoginServiceImpl implements WxLoginService { @Override public UserWechatDTO resiAndWorkLogin(String appId, String wxCode, String customerId, String clientType) { //1.获取用户openid和session_key - logger.info(String.format("wxcode获取微信用户信息，接口入参appId：%s;wxCode：%s;customerId：%s;clientType：%s"), appId, wxCode, customerId, clientType); + logger.info(String.format("wxcode获取微信用户信息，接口入参appId：[%s];wxCode：[%s];customerId：[%s];clientType：[%s]", appId, wxCode, customerId, clientType)); Map map = new HashMap<>(); map.put("appid", appId); map.put("js_code", wxCode);