TASK:admin-organization plan优化
This commit is contained in:
@@ -34,4 +34,8 @@ public class QueryUserConditionsVO extends PageQueryBaseVo {
|
|||||||
|
|
||||||
private Integer systemUser;
|
private Integer systemUser;
|
||||||
|
|
||||||
|
private Long subscriptionPlanId;
|
||||||
|
|
||||||
|
private Long organizationId;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -787,6 +787,14 @@ public class ConvenientInquiryServiceImpl extends ServiceImpl<QuestionnaireMappe
|
|||||||
queryWrapper.lt("create_date", queryUserConditionsVO.getEndTime());
|
queryWrapper.lt("create_date", queryUserConditionsVO.getEndTime());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!Objects.isNull(queryUserConditionsVO.getSubscriptionPlanId())) {
|
||||||
|
queryWrapper.eq("subscription_plan_id", queryUserConditionsVO.getSubscriptionPlanId());
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!Objects.isNull(queryUserConditionsVO.getOrganizationId())) {
|
||||||
|
queryWrapper.eq("organization_id", queryUserConditionsVO.getOrganizationId());
|
||||||
|
}
|
||||||
|
|
||||||
// 排序
|
// 排序
|
||||||
if (!StringUtils.isNullOrEmpty(queryUserConditionsVO.getOrder()) && !StringUtils.isNullOrEmpty(queryUserConditionsVO.getOrderBy())) {
|
if (!StringUtils.isNullOrEmpty(queryUserConditionsVO.getOrder()) && !StringUtils.isNullOrEmpty(queryUserConditionsVO.getOrderBy())) {
|
||||||
String orderBy = "id";
|
String orderBy = "id";
|
||||||
|
|||||||
Reference in New Issue
Block a user