|
@@ -218,7 +218,7 @@ public class AdmSystemController {
|
|
|
@PostMapping("/query")
|
|
|
public AdmResponse query(@RequestBody AdmQueryCriteria request) {
|
|
|
request.setName(AdmSystem.OBJ_TYPE);
|
|
|
- if(CollUtil.isNotEmpty(request.getProjection()) && request.getDistinct() && !request.getProjection().contains(BaseEntity.PROP_ID)){
|
|
|
+ if(CollUtil.isEmpty(request.getCascade()) && CollUtil.isNotEmpty(request.getProjection()) && request.getDistinct() && !request.getProjection().contains(BaseEntity.PROP_ID)){
|
|
|
RequestData requestData = new RequestData();
|
|
|
requestData.setProjection(request.getProjection());
|
|
|
requestData.setObjType(AdmSystem.OBJ_TYPE);
|