修改排序及路由
parent
c8f344ebe2
commit
8ba09d4d1d
|
|
@ -4,7 +4,7 @@ nacos:
|
||||||
application:
|
application:
|
||||||
name: jjb-saas-zcloud-basic-info
|
name: jjb-saas-zcloud-basic-info
|
||||||
version:
|
version:
|
||||||
gateway: basic-info
|
gateway: basicInfo
|
||||||
cn-name: 统一用户管理
|
cn-name: 统一用户管理
|
||||||
spring:
|
spring:
|
||||||
application:
|
application:
|
||||||
|
|
|
||||||
|
|
@ -71,6 +71,7 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserMapper, UserDO> i
|
||||||
queryWrapper.orderByDesc("u.sort");
|
queryWrapper.orderByDesc("u.sort");
|
||||||
queryWrapper.eq("u.delete_enum", "FALSE");
|
queryWrapper.eq("u.delete_enum", "FALSE");
|
||||||
queryWrapper.apply("u.id != u.corpinfo_id");
|
queryWrapper.apply("u.id != u.corpinfo_id");
|
||||||
|
queryWrapper.orderByAsc("u.sort").orderByDesc("u.create_time");
|
||||||
IPage<UserDO> result = userMapper.selectUserPage(iPage, queryWrapper);
|
IPage<UserDO> result = userMapper.selectUserPage(iPage, queryWrapper);
|
||||||
return PageHelper.pageToResponse(result, result.getRecords());
|
return PageHelper.pageToResponse(result, result.getRecords());
|
||||||
}
|
}
|
||||||
|
|
@ -154,9 +155,10 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserMapper, UserDO> i
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<UserDO> listByPostId(Long postId) {
|
public List<UserDO> listByPostId(Long postId) {
|
||||||
QueryWrapper queryWrapper = new QueryWrapper();
|
QueryWrapper<UserDO> queryWrapper = new QueryWrapper<>();
|
||||||
queryWrapper.eq("post_id", postId);
|
queryWrapper.eq("post_id", postId);
|
||||||
queryWrapper.eq("delete_enum", "FALSE");
|
queryWrapper.eq("delete_enum", "FALSE");
|
||||||
|
queryWrapper.orderByAsc("u.sort").orderByDesc("u.create_time");
|
||||||
List userPostList = this.list(queryWrapper);
|
List userPostList = this.list(queryWrapper);
|
||||||
return userPostList;
|
return userPostList;
|
||||||
}
|
}
|
||||||
|
|
@ -166,6 +168,7 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserMapper, UserDO> i
|
||||||
QueryWrapper<UserDO> queryWrapper = new QueryWrapper();
|
QueryWrapper<UserDO> queryWrapper = new QueryWrapper();
|
||||||
queryWrapper.in("post_id", postIds);
|
queryWrapper.in("post_id", postIds);
|
||||||
queryWrapper.eq("delete_enum", "FALSE");
|
queryWrapper.eq("delete_enum", "FALSE");
|
||||||
|
queryWrapper.orderByAsc("u.sort").orderByDesc("u.create_time");
|
||||||
List<UserDO> userPostList = this.list(queryWrapper);
|
List<UserDO> userPostList = this.list(queryWrapper);
|
||||||
return userPostList;
|
return userPostList;
|
||||||
}
|
}
|
||||||
|
|
@ -175,6 +178,7 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserMapper, UserDO> i
|
||||||
QueryWrapper<UserDO> queryWrapper = new QueryWrapper();
|
QueryWrapper<UserDO> queryWrapper = new QueryWrapper();
|
||||||
queryWrapper.eq("corpinfo_id", corpInfoId);
|
queryWrapper.eq("corpinfo_id", corpInfoId);
|
||||||
queryWrapper.eq("delete_enum", "FALSE");
|
queryWrapper.eq("delete_enum", "FALSE");
|
||||||
|
queryWrapper.orderByAsc("u.sort").orderByDesc("u.create_time");
|
||||||
return list(queryWrapper);
|
return list(queryWrapper);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -89,7 +89,7 @@
|
||||||
</foreach>
|
</foreach>
|
||||||
</if>
|
</if>
|
||||||
</where>
|
</where>
|
||||||
order by
|
order by u.sort ,
|
||||||
u.create_time desc
|
u.create_time desc
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue