|
|
@ -228,7 +228,7 @@ public class BasedataDeviceController extends BaseController { |
|
|
@GetMapping({"/treeAreaDeviceSelectFilterByPreset/relation/right"}) |
|
|
@GetMapping({"/treeAreaDeviceSelectFilterByPreset/relation/right"}) |
|
|
public AjaxResult treeAreaDeviceSelectFilterByPresetRight(BaseDataArea baseDataArea) { |
|
|
public AjaxResult treeAreaDeviceSelectFilterByPresetRight(BaseDataArea baseDataArea) { |
|
|
log.info("treeAreaDeviceSelectFilterByPreset param: {}", baseDataArea); |
|
|
log.info("treeAreaDeviceSelectFilterByPreset param: {}", baseDataArea); |
|
|
List<BaseDataArea> areaList = baseDataAreaService.selectAreaList(baseDataArea); |
|
|
|
|
|
|
|
|
List<BaseDataArea> areaList = baseDataAreaService.selectAreaRelationList(baseDataArea); |
|
|
List<String> filterNameList = baseDataArea.getFilterNameList(); |
|
|
List<String> filterNameList = baseDataArea.getFilterNameList(); |
|
|
if(filterNameList == null || filterNameList.isEmpty()) { |
|
|
if(filterNameList == null || filterNameList.isEmpty()) { |
|
|
filterNameList = new ArrayList<>(); |
|
|
filterNameList = new ArrayList<>(); |
|
|
|