|
@@ -275,7 +275,7 @@ public class AdmEquipmentController {
|
|
|
public AdmResponse query(@RequestBody AdmQueryCriteria request) throws Exception {
|
|
|
// 组装上下文条件
|
|
|
request.setName(AdmEquipment.OBJ_TYPE);
|
|
|
- if(CollUtil.isEmpty(request.getCascade()) && CollUtil.isNotEmpty(request.getProjection()) && request.getDistinct() && request.getProjection().size() == 1 && request.getProjection().get(0).equals("classCode")) {
|
|
|
+ if(CollUtil.isEmpty(request.getCascade()) && CollUtil.isNotEmpty(request.getProjection()) && request.getDistinct() != null && request.getDistinct() && request.getProjection().size() == 1 && request.getProjection().get(0).equals("classCode")) {
|
|
|
/** 特殊处理
|
|
|
* distinct: true
|
|
|
* pageNumber: 1
|