Merge remote-tracking branch 'origin/dev-2.0' into dev-2.0

src/main/java/com/sooka/sponest/data/digitalwater/service/impl/WaterBigDataServiceImpl.java

@@ -1,6 +1,5 @@
 package com.sooka.sponest.data.digitalwater.service.impl;
 
-import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.datascope.annotation.DataScopeMutiDept;
 import com.sooka.sponest.data.app.domain.VisuForestCloudMapVO;
@@ -156,7 +155,11 @@ public class WaterBigDataServiceImpl extends BaseServiceImpl implements IWaterBi
     public List<Map<String,Object>> selectHydropowerResources(CenterdataTResourcesHydroenergy centerdataTResourcesHydroenergy) throws IOException {
         setSookaDataBase(centerdataTResourcesHydroenergy);
         List<Map<String,Object>> list = waterBigDataMapper.selectCenterdataTResourcesHydroenergyList(centerdataTResourcesHydroenergy);
-        return deptLevelUtil.getDeptLevel(list);
+        String deptId = "";
+        if (!StringUtils.isNull(centerdataTResourcesHydroenergy.getDeptId())){
+            deptId = centerdataTResourcesHydroenergy.getDeptId().toString();
+        }
+        return deptLevelUtil.getDeptLevel(list,deptId);
     }