|
@ -1,5 +1,6 @@ |
|
|
package awesome.group.game.service.matrix; |
|
|
package awesome.group.game.service.matrix; |
|
|
|
|
|
|
|
|
|
|
|
import awesome.group.game.dao.bean.MatrixAdmin; |
|
|
import awesome.group.game.dao.bean.MatrixApp; |
|
|
import awesome.group.game.dao.bean.MatrixApp; |
|
|
import awesome.group.game.dao.bean.MatrixUser; |
|
|
import awesome.group.game.dao.bean.MatrixUser; |
|
|
import awesome.group.game.dao.mapper.MatrixAppMapper; |
|
|
import awesome.group.game.dao.mapper.MatrixAppMapper; |
|
@ -7,6 +8,7 @@ import awesome.group.game.dao.mapper.MatrixUserMapper; |
|
|
import awesome.group.game.service.bo.PageResult; |
|
|
import awesome.group.game.service.bo.PageResult; |
|
|
import awesome.group.game.service.bo.citrus.UserBo; |
|
|
import awesome.group.game.service.bo.citrus.UserBo; |
|
|
import awesome.group.game.service.bo.matrix.UserQuery; |
|
|
import awesome.group.game.service.bo.matrix.UserQuery; |
|
|
|
|
|
import awesome.group.game.service.util.Constants; |
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; |
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; |
|
|
import com.baomidou.mybatisplus.core.metadata.IPage; |
|
|
import com.baomidou.mybatisplus.core.metadata.IPage; |
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
|
@ -31,13 +33,18 @@ public class MatrixUserService { |
|
|
@Autowired |
|
|
@Autowired |
|
|
private AdminService adminService; |
|
|
private AdminService adminService; |
|
|
|
|
|
|
|
|
public PageResult<UserBo> list(UserQuery query) { |
|
|
public PageResult<UserBo> list(Integer adminId, UserQuery query) { |
|
|
|
|
|
MatrixAdmin admin = adminService.getAdmin(adminId); |
|
|
|
|
|
|
|
|
MatrixApp app = appMapper.queryByCode(query.appCode); |
|
|
MatrixApp app = appMapper.queryByCode(query.appCode); |
|
|
LambdaQueryWrapper<MatrixUser> wrapper = new LambdaQueryWrapper<>(); |
|
|
LambdaQueryWrapper<MatrixUser> wrapper = new LambdaQueryWrapper<>(); |
|
|
wrapper.eq(MatrixUser::getAppId, app.getId()); |
|
|
wrapper.eq(MatrixUser::getAppId, app.getId()); |
|
|
if (query.userId != null) { |
|
|
if (query.userId != null) { |
|
|
wrapper.eq(MatrixUser::getId, query.userId); |
|
|
wrapper.eq(MatrixUser::getId, query.userId); |
|
|
} |
|
|
} |
|
|
|
|
|
if (admin.getRole() == Constants.PROXY) { |
|
|
|
|
|
wrapper.eq(MatrixUser::getAdminId, adminId); |
|
|
|
|
|
} |
|
|
int page = query.current; |
|
|
int page = query.current; |
|
|
int pageSize = query.pageSize; |
|
|
int pageSize = query.pageSize; |
|
|
wrapper.orderByDesc(MatrixUser::getId); |
|
|
wrapper.orderByDesc(MatrixUser::getId); |
|
|