diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/dao/ResiGroupMemberDao.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/dao/ResiGroupMemberDao.java index 6c7d8bf7b5..737474d53d 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/dao/ResiGroupMemberDao.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/dao/ResiGroupMemberDao.java @@ -85,7 +85,7 @@ public interface ResiGroupMemberDao extends BaseDao { * @Description 查看用户是否存在有效的入群申请 * @Date 2020/3/31 14:52 **/ - GroupMemeberOperationDTO selectGroupMemberOperationUnderAudit(@Param("userId") String userId, @Param("groupId") String groupId); + GroupMemeberOperationDTO selectGroupMemberOperationLatest(@Param("userId") String userId, @Param("groupId") String groupId); /** * @return com.epmet.resi.group.dto.member.ResiGroupMemberDTO diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java index f3d6f585a5..25d308c595 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java @@ -48,6 +48,7 @@ import com.epmet.resi.group.dto.member.form.*; import com.epmet.resi.group.dto.member.result.ApplyingMemberResultDTO; import com.epmet.resi.group.dto.member.result.GroupMemberListResultDTO; import org.apache.commons.lang3.StringUtils; +import org.bouncycastle.math.raw.Mod; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -176,14 +177,17 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl - select gmo.* from group_memeber_operation gmo where gmo.DEL_FLAG='0' - and gmo.OPERATE_STATUS='under_auditting' and gmo.CUSTOMER_USER_ID=#{userId} and gmo.GROUP_ID=#{groupId} + order by gmo.CREATED_TIME desc + limit 1