|
|
@@ -106,7 +106,18 @@ public class FmsBlockController extends BaseController
|
|
|
@PreAuthorize("@ss.hasPermi('fms:block:tree:list')")
|
|
|
@GetMapping("/tree/list")
|
|
|
public AjaxResult treeList(FmsBlock fmsBlock) {
|
|
|
+ boolean b = SecurityUtils.isValidate();
|
|
|
+ if (b) {
|
|
|
+ //true需要进行权限校验。下拉框基地列表查询需要包含分配的基地以及分配地块所属基地
|
|
|
+ List<String> strings = dataAuthUtil.landList();
|
|
|
+ if (strings.isEmpty()) {
|
|
|
+ return AjaxResult.success(new ArrayList<>());
|
|
|
+ }
|
|
|
+ fmsBlock.setDataFilter(true);
|
|
|
+ fmsBlock.setLandIds(strings);
|
|
|
+ }
|
|
|
FmsLand fmsLandQuery = new FmsLand();
|
|
|
+ fmsLandQuery.setBlockIds(fmsBlock.getLandIds());
|
|
|
fmsLandQuery.setTid(SecurityUtils.getTid());
|
|
|
//查询基地列表
|
|
|
List<FmsLand> list = fmsLandService.selectFmsLandList(fmsLandQuery);
|