|
@@ -208,11 +208,7 @@ public class ForestBigDataServiceImpl extends BaseServiceImpl implements IForest
|
|
public List<Map<String,Object>> selectResourcesAreaCount(CenterdataTForestResources centerdataTForestResources) throws IOException {
|
|
public List<Map<String,Object>> selectResourcesAreaCount(CenterdataTForestResources centerdataTForestResources) throws IOException {
|
|
setSookaDataBase(centerdataTForestResources);
|
|
setSookaDataBase(centerdataTForestResources);
|
|
List<Map<String,Object>> list = forestBigDataMapper.selectResourcesAreaCount(centerdataTForestResources);
|
|
List<Map<String,Object>> list = forestBigDataMapper.selectResourcesAreaCount(centerdataTForestResources);
|
|
- String deptId = "";
|
|
|
|
- if (!StringUtils.isNull(centerdataTForestResources.getDeptId())){
|
|
|
|
- deptId = String.valueOf(centerdataTForestResources.getDeptId());
|
|
|
|
- }
|
|
|
|
- return deptLevelUtil.getDeptLevel(list,deptId);
|
|
|
|
|
|
+ return deptLevelUtil.getDeptLevel(list,String.valueOf(centerdataTForestResources.getDeptId()));
|
|
}
|
|
}
|
|
|
|
|
|
@DataScopeMutiDept(deptAlias = "d")
|
|
@DataScopeMutiDept(deptAlias = "d")
|
|
@@ -220,11 +216,7 @@ public class ForestBigDataServiceImpl extends BaseServiceImpl implements IForest
|
|
public List<Map<String,Object>> selectForestGridCount(CenterdataTForestGridLevelVo centerdataTForestGridLevel) throws IOException {
|
|
public List<Map<String,Object>> selectForestGridCount(CenterdataTForestGridLevelVo centerdataTForestGridLevel) throws IOException {
|
|
setSookaDataBase(centerdataTForestGridLevel);
|
|
setSookaDataBase(centerdataTForestGridLevel);
|
|
List<Map<String,Object>> list = forestBigDataMapper.selectForestGridCount(centerdataTForestGridLevel);
|
|
List<Map<String,Object>> list = forestBigDataMapper.selectForestGridCount(centerdataTForestGridLevel);
|
|
- String deptId = "";
|
|
|
|
- if (!StringUtils.isNull(centerdataTForestGridLevel.getDeptId())){
|
|
|
|
- deptId = String.valueOf(centerdataTForestGridLevel.getDeptId());
|
|
|
|
- }
|
|
|
|
- return deptLevelUtil.getDeptLevel(list,deptId);
|
|
|
|
|
|
+ return deptLevelUtil.getDeptLevel(list,String.valueOf(centerdataTForestGridLevel.getDeptId()));
|
|
}
|
|
}
|
|
|
|
|
|
@DataScopeMutiDept(deptAlias = "d")
|
|
@DataScopeMutiDept(deptAlias = "d")
|
|
@@ -232,11 +224,7 @@ public class ForestBigDataServiceImpl extends BaseServiceImpl implements IForest
|
|
public List<Map<String,Object>> selectTreeCount(CenterdataTForestTrees centerdataTForestTrees) {
|
|
public List<Map<String,Object>> selectTreeCount(CenterdataTForestTrees centerdataTForestTrees) {
|
|
setSookaDataBase(centerdataTForestTrees);
|
|
setSookaDataBase(centerdataTForestTrees);
|
|
List<Map<String,Object>> list = forestBigDataMapper.selectTreeCount(centerdataTForestTrees);
|
|
List<Map<String,Object>> list = forestBigDataMapper.selectTreeCount(centerdataTForestTrees);
|
|
- String deptId = "";
|
|
|
|
- if (!StringUtils.isNull(centerdataTForestTrees.getDeptId())){
|
|
|
|
- deptId = String.valueOf(centerdataTForestTrees.getDeptId());
|
|
|
|
- }
|
|
|
|
- return deptLevelUtil.getDeptLevel(list,deptId);
|
|
|
|
|
|
+ return deptLevelUtil.getDeptLevel(list,String.valueOf(centerdataTForestTrees.getDeptId()));
|
|
}
|
|
}
|
|
|
|
|
|
}
|
|
}
|