|
@@ -161,10 +161,75 @@ public class SysUserController {
|
|
|
//角色为 管理员并且projectId是空表示:全量查询
|
|
|
|
|
|
if (!"admin".equals(roleCode)) {
|
|
|
- user.setLeaderId(userId);
|
|
|
- PageHelper.startPage(pageNo, pageSize);
|
|
|
List<SysUser> list = sysUserService.queryPageList(user);
|
|
|
+ //1.根据搜索框过滤数据
|
|
|
+ if(!Check.isNull(user.getUsername())){
|
|
|
+ Iterator<SysUser> it = list.iterator();
|
|
|
+ while(it.hasNext()){
|
|
|
+ if(!it.next().getUsername().contains(user.getUsername())) {
|
|
|
+ it.remove();
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if(!Check.isNull(user.getRealname())){
|
|
|
+ Iterator<SysUser> it = list.iterator();
|
|
|
+ while(it.hasNext()){
|
|
|
+ if(!it.next().getRealname().contains(user.getRealname())) {
|
|
|
+ it.remove();
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if(!Check.isNull(user.getLeaderName())){
|
|
|
+ Iterator<SysUser> it = list.iterator();
|
|
|
+ while(it.hasNext()){
|
|
|
+ if(!it.next().getLeaderName().contains(user.getLeaderName())) {
|
|
|
+ it.remove();
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if(!Check.isNull(user.getRoleName())){
|
|
|
+ Iterator<SysUser> it = list.iterator();
|
|
|
+ while(it.hasNext()){
|
|
|
+ if(!it.next().getRoleName().contains(user.getRoleName())) {
|
|
|
+ it.remove();
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if(!Check.isNull(user.getDepartId())){
|
|
|
+ Iterator<SysUser> it = list.iterator();
|
|
|
+ while(it.hasNext()){
|
|
|
+ SysUser user2 = it.next();
|
|
|
+ if(Check.isNull(user2.getDepartId2()) || !user2.getDepartId2().equals(user.getDepartId())) {
|
|
|
+ it.remove();
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if(!Check.isNull(user.getEmail())){
|
|
|
+ Iterator<SysUser> it = list.iterator();
|
|
|
+ while(it.hasNext()){
|
|
|
+ if(!it.next().getEmail().contains(user.getEmail())) {
|
|
|
+ it.remove();
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if(!Check.isNull(user.getStatus())){
|
|
|
+ Iterator<SysUser> it = list.iterator();
|
|
|
+ while(it.hasNext()){
|
|
|
+ if(!it.next().getStatus().equals(user.getStatus())) {
|
|
|
+ it.remove();
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ //2.根据分页页数和条数来筛选数据
|
|
|
+ int total = list.size();
|
|
|
+ int beginIndex = (pageNo - 1) * pageSize + 1;
|
|
|
+ int endIndex = beginIndex + pageSize;
|
|
|
+ if(list.size() > beginIndex){
|
|
|
+ list = list.subList(beginIndex-1,list.size() > endIndex ? endIndex : list.size());
|
|
|
+ }
|
|
|
+
|
|
|
PageInfo<SysUser> pageInfo = new PageInfo<>(list);
|
|
|
+ pageInfo.setTotal(total);
|
|
|
return Result.ok(pageInfo);
|
|
|
}else{
|
|
|
user.setId(null);
|