From 9f1605faac36b06fae0384108066636e3ed41e10 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 20 Jul 2021 14:03:34 +0800
Subject: [PATCH 1/3] =?UTF-8?q?/resi/group/resigroupcode/groupcodebasicinf?=
 =?UTF-8?q?o=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../invitation/service/impl/GroupInvitationServiceImpl.java      | 1 +
 .../src/main/resources/mapper/group/ResiGroupCodeDao.xml         | 1 +
 2 files changed, 2 insertions(+)

diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java
index 93a3d454a6..f13010a93c 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java
@@ -224,6 +224,7 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 		calendar.set(Calendar.YEAR, calendar.get(Calendar.YEAR) + NumConstant.FIFTY);
 		groupInvitationEntity.setValidEndTime(calendar.getTime());
 		groupInvitationEntity.setResiGroupId(formDTO.getGroupId());
+		groupInvitationEntity.setCustomerId(resiGroupDTO.getCustomerId());
 		insert(groupInvitationEntity);
 		CreateGroupInvitationResultDTO resultDTO = new CreateGroupInvitationResultDTO();
 		resultDTO.setInvitationId(groupInvitationEntity.getId());
diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupCodeDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupCodeDao.xml
index a3cc1c6fd5..77a8dab576 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupCodeDao.xml
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupCodeDao.xml
@@ -22,6 +22,7 @@
         <if test='null != gridId and "" != gridId'>
             and rg.grid_id = #{gridId}
         </if>
+        order by rgc.CREATED_TIME desc limit 1
     </select>
 
 </mapper>

From 0eb69005358632310e06b28355104d5111584713 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Tue, 20 Jul 2021 15:11:16 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=85=9A=E5=91=98=E8=AE=A4=E8=AF=81bug?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9-=E6=89=8B=E6=9C=BA=E5=8F=B7=E5=AD=98?=
 =?UTF-8?q?=E5=9C=A8=E6=97=B6=E6=8A=9B=E5=87=BA=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/service/impl/UserResiInfoServiceImpl.java     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java
index af8191b9a2..53befc262c 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java
@@ -311,6 +311,7 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
 			userCustomerDao.updateRegistered(userResiInfoDTO.getCustomerId(), userResiInfoDTO.getUserId());
 		}else{
 			log.error("手机号客户内不可用，没有更新用户信息，param:{}", JSON.toJSONString(userResiInfoDTO));
+			throw new RenException(EpmetErrorCode.THE_MOBILE_HAS_BEEN_USED.getCode());
 		}
 
 		return result;

From 81d5db50d99953ff58e2631d614a0ed43ded7048 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Thu, 22 Jul 2021 10:03:17 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=B8=93=E9=A2=98=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E6=95=88=E6=9E=9C=E9=A2=84=E8=A7=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gov-voice-server/src/main/resources/mapper/ArticleDao.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleDao.xml b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleDao.xml
index 03351836b9..fbf917b579 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleDao.xml
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleDao.xml
@@ -402,8 +402,8 @@
         IFNULL(art.TAGS,'') AS tagName
         FROM
         ARTICLE art
-        INNER JOIN article_cover ac ON art.ID = ac.ARTICLE_ID
-        INNER JOIN ARTICLE_PUBLISH_RANGE prange
+        LEFT JOIN article_cover ac ON art.ID = ac.ARTICLE_ID
+        LEFT JOIN ARTICLE_PUBLISH_RANGE prange
         ON art.ID = prange.ARTICLE_ID
         AND
         prange.DEL_FLAG = '0'