Merge remote-tracking branch 'origin/fix_2nd_period' into fix_2nd_period
This commit is contained in:
+3
@@ -75,6 +75,9 @@ public class ParamsExportTemplateEOController extends JeroController<ParamsExpor
|
||||
}
|
||||
|
||||
QueryWrapper<ParamsExportTemplateEO> queryWrapper = new QueryWrapper<>();
|
||||
if(StringUtils.isNotBlank(paramsExportTemplateEO.getRegion())){
|
||||
queryWrapper.in("region",paramsExportTemplateEO.getRegion());
|
||||
}
|
||||
queryWrapper.lambda().like(StringUtils.isNotEmpty(paramsExportTemplateEO.getTemplateName()), ParamsExportTemplateEO::getTemplateName, paramsExportTemplateEO.getTemplateName());
|
||||
queryWrapper.orderBy(StringUtils.isNotBlank(paramsExportTemplateEO.getOrderByField()), "1".equals(paramsExportTemplateEO.getOrderBy())?true:false, paramsExportTemplateEO.getOrderByField())
|
||||
.orderBy(StringUtils.isBlank(paramsExportTemplateEO.getOrderByField()), false, "create_time"); // 默认按创建时间降序
|
||||
|
||||
Reference in New Issue
Block a user