From 556717400f442495b77bbb16bbb4e1965763795f Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 15 Jul 2020 10:28:28 +0800
Subject: [PATCH] 20200715  代码提交

---
 src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java |    4 ++--
 src/main/resources/mapper/modules/MemberMapper.xml                                |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java b/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
index d486529..252d6fe 100644
--- a/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
@@ -185,8 +185,8 @@
         List<MemberEntity> records = selectMemberListInPage.getRecords();
         if(records != null && records.size() > 0) {
         	for(MemberEntity memberEntitys : records) {
-        		String firstName = memberEntitys.getFirstName();
-        		String secondName = memberEntitys.getSecondName();
+        		String firstName = (memberEntitys.getFirstName() == null ? "" : memberEntitys.getFirstName());
+        		String secondName = (memberEntitys.getSecondName() == null ? "" : memberEntitys.getSecondName());
         		memberEntitys.setRealName(firstName+secondName);
         	}
         }
diff --git a/src/main/resources/mapper/modules/MemberMapper.xml b/src/main/resources/mapper/modules/MemberMapper.xml
index a5d9f63..c4ef057 100644
--- a/src/main/resources/mapper/modules/MemberMapper.xml
+++ b/src/main/resources/mapper/modules/MemberMapper.xml
@@ -30,7 +30,7 @@
                 </if>
             </if>
         </where>
-        order by create_time desc
+        order by m.create_time desc
     </select>
     
     <select id="findMemberAccountInfoListInPage" resultType="com.xcong.excoin.modules.trademanage.vo.MemberAccountInfoVo">

--
Gitblit v1.9.1