From 35bd26f5a2fb5cb6e1cb8ba15302520022cd640a Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 18 Nov 2020 16:26:24 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=BE=BD=E7=AB=A0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/UserBadgeServiceImpl.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java index a3e956ff5c..eb3851c3ed 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java @@ -29,10 +29,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.concurrent.atomic.AtomicReference; import java.util.stream.Collectors; @@ -124,7 +121,7 @@ public class UserBadgeServiceImpl implements UserBadgeService { } }); }); - return userOperListResultDTOS; + return userOperListResultDTOS.stream().sorted(Comparator.comparing(UserOperListResultDTO::getBadgeName)).collect(Collectors.toList()); } /** From db641b29275ff97d5337bef650fe201c104fb47d Mon Sep 17 00:00:00 2001 From: liushaowen <565850092@qq.com> Date: Wed, 18 Nov 2020 16:46:03 +0800 Subject: [PATCH 2/3] =?UTF-8?q?user=5Fadvice=E4=BF=AE=E6=94=B9content?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V0.0.9__alter_useradvice_content.sql | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.9__alter_useradvice_content.sql diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.9__alter_useradvice_content.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.9__alter_useradvice_content.sql new file mode 100644 index 0000000000..112c6b0e72 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.9__alter_useradvice_content.sql @@ -0,0 +1,9 @@ +ALTER TABLE `user_advice` DROP COLUMN `ADVICE_CONTENT`; + +ALTER TABLE `user_advice` +ADD COLUMN `ADVICE_CONTENT` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT '建议内容' NOT NULL AFTER `REG_PHONE`; + +ALTER TABLE `user_advice` DROP COLUMN `GOV_CONTENT`; + +ALTER TABLE `user_advice` +ADD COLUMN `GOV_CONTENT` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT '建议回复内容' NULL AFTER `REPLY_TIME`; From 23cd7d38733b8aaf9d38c281a2710e2c1b702de7 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 19 Nov 2020 09:46:10 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=BE=BD=E7=AB=A0=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E9=80=9A=E8=BF=87=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/constant/BadgeMessageConstant.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/BadgeMessageConstant.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/BadgeMessageConstant.java index d0dc2a5529..429baa87ad 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/BadgeMessageConstant.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/BadgeMessageConstant.java @@ -15,7 +15,7 @@ public interface BadgeMessageConstant { /** * 审核通过消息模板 */ - String APPROVED_MSG = "您好，您提交的%s申请已通过，请查看。"; + String APPROVED_MSG = "您好，您的%s认证通过并点亮，请查看。"; /** * 审核驳回消息模板 */