yitisheng
/
yitisheng-new-api
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

updates

This commit is contained in:
zhouwentao 2025-06-26 08:28:11 +08:00
parent 792aa90388
commit 45f04ecd12
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserOnlineController.java
View File

@ -51,6 +51,7 @@ public class SysUserOnlineController {
@RequestMapping(value = "/list", method = RequestMethod.GET) @RequestMapping(value = "/list", method = RequestMethod.GET)
public Result<Page<SysUserOnlineVO>> list(@RequestParam(name="username", required=false) String username, public Result<Page<SysUserOnlineVO>> list(@RequestParam(name="username", required=false) String username,
@RequestParam(name="phone", required=false) String phone,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,@RequestParam(name="pageSize", defaultValue="10") Integer pageSize) { @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,@RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
Collection<String> keys = redisTemplate.keys(CommonConstant.PREFIX_USER_TOKEN + "*"); Collection<String> keys = redisTemplate.keys(CommonConstant.PREFIX_USER_TOKEN + "*");
List<SysUserOnlineVO> onlineList = new ArrayList<SysUserOnlineVO>(); List<SysUserOnlineVO> onlineList = new ArrayList<SysUserOnlineVO>();
@ -66,7 +67,7 @@ public class SysUserOnlineController {
//验证用户名是否与传过来的用户名相同 //验证用户名是否与传过来的用户名相同
boolean isMatchUsername=true; boolean isMatchUsername=true;
//判断用户名是否为空，并且当前循环的用户不包含传过来的用户名，那么就设成false //判断用户名是否为空，并且当前循环的用户不包含传过来的用户名，那么就设成false
if(oConvertUtils.isNotEmpty(username) && !loginUser.getUsername().contains(username)){ if((oConvertUtils.isNotEmpty(username) && !loginUser.getUsername().contains(username)) || (oConvertUtils.isNotEmpty(phone) && oConvertUtils.isNotEmpty(loginUser.getPhone()) && !loginUser.getPhone().contains(phone))){
isMatchUsername = false; isMatchUsername = false;
} }
if(isMatchUsername){ if(isMatchUsername){