|
@@ -58,7 +58,11 @@ public class AdmFloorServiceImpl extends AbstractAdmBaseServiceImpl<AdmFloor> im
|
|
|
// 设置级联查询参数
|
|
|
AdmQueryCriteria buildCriteria = new AdmQueryCriteria();
|
|
|
buildCriteria.setName("building");
|
|
|
- criteria.setCascade(CollUtil.newArrayList(buildCriteria));
|
|
|
+ if (CollUtil.isEmpty(criteria.getCascade())){
|
|
|
+ criteria.setCascade(CollUtil.newArrayList(buildCriteria));
|
|
|
+ }else {
|
|
|
+ criteria.getCascade().add(buildCriteria);
|
|
|
+ }
|
|
|
AdmResponse response = this.doQuery(context, criteria, AdmFloor.class);
|
|
|
List<AdmFloor> admFloors = (List<AdmFloor>) response.getContent();
|
|
|
if (CollUtil.isNotEmpty(admFloors)){
|