This commit is contained in:
张良(004796)
2024-01-19 15:49:23 +08:00
parent fbc18b491d
commit edbae82e7d
10 changed files with 147 additions and 12 deletions

View File

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.cai.domain.*;
import com.ruoyi.cai.dto.admin.vo.UserAdminVo;
import com.ruoyi.cai.dto.app.query.index.GreetQuery;
import com.ruoyi.cai.dto.app.query.index.UserMapperQuery;
import com.ruoyi.cai.dto.app.query.index.UserQuery;
import com.ruoyi.cai.dto.app.vo.user.UserInfoVo;
import com.ruoyi.cai.dto.app.vo.user.UserListVo;
@@ -79,7 +80,19 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
@Override
public Page<UserListVo> pageApp(PageQuery page, UserQuery query) {
return baseMapper.pageApp(page.build(),query);
UserMapperQuery mapperQuery = new UserMapperQuery();
mapperQuery.setGender(query.getGender());
if(query.getType() == null || StringUtils.isEmpty(query.getText())){
return new Page<>();
}
if(query.getType() == 1){
mapperQuery.setUsercodeAndNickname(query.getText());
}else if(query.getType() == 2){
mapperQuery.setUsercode(query.getText());
}else if(query.getType() == 3){
mapperQuery.setNickname(query.getText());
}
return baseMapper.pageApp(page.build(),mapperQuery);
}
@Override