diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserInvitationDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserInvitationDao.java index 948c57edf0..4409c5f7cd 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserInvitationDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserInvitationDao.java @@ -23,6 +23,8 @@ import com.epmet.entity.UserInvitationEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * 人员邀请关系表 记录user之间的邀请关系 * @@ -41,7 +43,7 @@ public interface UserInvitationDao extends BaseDao { * @Description 根据被邀请人id、邀请链接id、邀请场景查询人员邀请记录 * @Date 2020/4/10 0:36 **/ - UserInvitationDTO selectUserInvitation(@Param("inviteeUserId") String inviteeUserId, - @Param("inviteSourceId") String inviteSourceId, - @Param("inviteSource") String inviteSource); + List selectUserInvitation(@Param("inviteeUserId") String inviteeUserId, + @Param("inviteSourceId") String inviteSourceId, + @Param("inviteSource") String inviteSource); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserInvitationServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserInvitationServiceImpl.java index adfae02876..30e26b0a98 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserInvitationServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserInvitationServiceImpl.java @@ -34,6 +34,7 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; import java.util.Arrays; import java.util.Date; @@ -106,10 +107,10 @@ public class UserInvitationServiceImpl extends BaseServiceImpl userInvitationDTOList = baseDao.selectUserInvitation(formDTO.getInviteeUserId(), formDTO.getInviteSourceId(), formDTO.getInviteSource()); - if (null == userInvitationDTO) { + if (CollectionUtils.isEmpty(userInvitationDTOList)) { UserInvitationDTO insertUserInvitationDTO = new UserInvitationDTO(); insertUserInvitationDTO.setCustomerId(formDTO.getCustomerId()); insertUserInvitationDTO.setGridId(formDTO.getGridId()); @@ -120,8 +121,10 @@ public class UserInvitationServiceImpl extends BaseServiceImpl{ + userInvitationDTO.setInvitationTime(new Date()); + this.update(userInvitationDTO); + }); } return new Result(); }