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 f13010a93c..3a59f101a0 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 @@ -494,9 +494,13 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl result=resiGuideFeignClient.enterGrid(userEnterGridFormDTO); if (!result.success() || null == result.getData()) { logger.warn(String.format("用户同意邀请进组,进入网格失败。入参:userId【%s】、invitationId【%s】、groupId【%s】、customerId【%s】、gridId【%s】", - formDTO.getUserId(), formDTO.getInvitationId(), - groupInvitationDTO.getResiGroupId()), - resiGroupDTO.getCustomerId(), resiGroupDTO.getGridId()); + formDTO.getUserId(), + formDTO.getInvitationId(), + groupInvitationDTO.getResiGroupId(), + resiGroupDTO.getCustomerId(), + resiGroupDTO.getGridId() + ) + ); logger.warn(String.format("用户同意邀请进组,进入网格失败。当前接口返回8000,调用enterGrid接口返回", result.toString())); throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode()); } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/GridLatestDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/GridLatestDao.xml index 911c243bc8..59f1be1af7 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/GridLatestDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/GridLatestDao.xml @@ -47,6 +47,7 @@ AND la.customer_user_id = #{customerUserId} + order by la.CREATED_TIME desc limit 1