Merge branch 'dev_special_subject' into develop

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'

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());

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>

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;