|
@@ -61,10 +61,15 @@ public class AdmQueryCriteriaHelper {
|
|
|
// 拷贝分页
|
|
|
copyPageInfo(admCriteria, dmpCriteria);
|
|
|
// 处理filters
|
|
|
- dmpCriteria.setCriteria(toCriteria(admCriteria.getName(), admCriteria.getFilters()));
|
|
|
+ ObjectNode criteria = toCriteria(admCriteria.getName(), admCriteria.getFilters());
|
|
|
+ dmpCriteria.setCriteria(criteria);
|
|
|
if(StrUtil.isNotEmpty(admCriteria.getName())){
|
|
|
// 处理name
|
|
|
- dmpCriteria.getCriteria().put("objType", admCriteria.getName());
|
|
|
+ criteria.put("objType", admCriteria.getName());
|
|
|
+ }
|
|
|
+ // 补充valid = 1
|
|
|
+ if(!criteria.has("valid")) {
|
|
|
+ criteria.put("valid", 1);
|
|
|
}
|
|
|
// 处理排序
|
|
|
dmpCriteria.setOrders(toOrderItem(admCriteria.getOrders()));
|