@ -47,7 +47,7 @@ public class PushApplicationController {
.eq(PushApplication::getCreateById, SecurityUtils.getUser().getId())
.eq(StrUtil.isNotBlank(pushApplication.getName()), PushApplication::getName, pushApplication.getName())
.eq(StrUtil.isNotBlank(pushApplication.getStatus()), PushApplication::getStatus, pushApplication.getStatus())
.orderByDesc(PushApplication::getCreateTime);
.orderByAsc(PushApplication::getCreateTime);
}
@ApiOperation("分页查询")
@ -90,7 +90,8 @@ public class PushApplicationServiceImpl extends ServiceImpl<PushApplicationMappe
SecurityContextHolder.getContext().setAuthentication(authentication);
// todo: // 待处理需要使用枚举规范用户类型参数,不好维护
if (!StrUtil.equals(SecurityUtils.getUser().getUserType(), "2") || !StrUtil.equals(SecurityUtils.getUser().getUserType(), "5")) {
if (!StrUtil.equals(SecurityUtils.getUser().getUserType(), "2") &&
!StrUtil.equals(SecurityUtils.getUser().getUserType(), "5")) {
throw new CheckedException("当前用户不是企业用户,禁止操作!");