diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DmPlayerentServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DmPlayerentServiceImpl.java index eb1da36..3f9cc93 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DmPlayerentServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DmPlayerentServiceImpl.java @@ -179,7 +179,7 @@ public class DmPlayerentServiceImpl extends ServiceImpl selectDmPlayerentList(DmPlayerent dmPlayerent) { - if (SecurityUtils.getUserId() != 1L) { + if (null != SecurityUtils.getUserId() && SecurityUtils.getUserId() != 1L) { dmPlayerent.setAccountid(SecurityUtils.getUserId()); } List list = dmPlayerentMapper.selectDmPlayerentList(dmPlayerent); diff --git a/ruoyi-system/src/main/resources/mapper/system/DmPlayerentMapper.xml b/ruoyi-system/src/main/resources/mapper/system/DmPlayerentMapper.xml index bacc81f..cfe6393 100644 --- a/ruoyi-system/src/main/resources/mapper/system/DmPlayerentMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/DmPlayerentMapper.xml @@ -35,6 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and name like concat('%', #{name}, '%') and online_status = #{onlineStatus} and player_status = #{playerStatus} + and accountId = #{accountid} and ip like concat('%', #{ip}, '%')