deptId校验

src/main/java/com/sooka/sponest/data/digitalagriculture/service/impl/AgricultureBigDataServiceImpl.java

@@ -223,7 +223,7 @@ public class AgricultureBigDataServiceImpl extends BaseServiceImpl implements IA
             objectObjectHashMap.put("stockNum", 0);
             list.add(objectObjectHashMap);
         }
-        if (StringUtils.isEmpty(agricultureBigDataBO.getDeptId().toString())){
+        if (StringUtils.isNull(agricultureBigDataBO.getDeptId())){
             agricultureBigDataBO.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
         }
         return deptLevelUtil.getDeptLevel(list,String.valueOf(agricultureBigDataBO.getDeptId()));
@@ -249,14 +249,14 @@ public class AgricultureBigDataServiceImpl extends BaseServiceImpl implements IA
         int currentYear = calendar.get(Calendar.YEAR);
         // 获取当前年份的数据
         List<Map<String, Object>> currentYearStatistics = getStatisticsByYear(agricultureBigDataBO, String.valueOf(currentYear));
-        if (StringUtils.isEmpty(agricultureBigDataBO.getDeptId().toString())){
+        if (StringUtils.isNull(agricultureBigDataBO.getDeptId())){
             agricultureBigDataBO.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
         }
         List<Map<String, Object>> deptLevel = deptLevelUtil.getDeptLevel(currentYearStatistics,String.valueOf(agricultureBigDataBO.getDeptId()));
         // 获取过去五年的数据
         for (int i = currentYear - 1; i >= currentYear - 4; i--) {
             List<Map<String, Object>> statisticsByYear = getStatisticsByYear(agricultureBigDataBO, String.valueOf(i));
-            if (StringUtils.isEmpty(agricultureBigDataBO.getDeptId().toString())){
+            if (StringUtils.isNull(agricultureBigDataBO.getDeptId())){
                 agricultureBigDataBO.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
             }
             deptLevel.addAll(deptLevelUtil.getDeptLevel(statisticsByYear,String.valueOf(agricultureBigDataBO.getDeptId())));
@@ -304,7 +304,7 @@ public class AgricultureBigDataServiceImpl extends BaseServiceImpl implements IA
             objectObjectHashMap.put("breedMoneyNum", 0);
             agriculturalSubsidy.add(objectObjectHashMap);
         }
-        if (StringUtils.isEmpty(agricultureBigDataBO.getDeptId().toString())){
+        if (StringUtils.isNull(agricultureBigDataBO.getDeptId())){
             agricultureBigDataBO.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
         }
         return deptLevelUtil.getDeptLevel(agriculturalSubsidy,String.valueOf(agricultureBigDataBO.getDeptId()));
@@ -398,7 +398,7 @@ public class AgricultureBigDataServiceImpl extends BaseServiceImpl implements IA
         Map<String, Object> map = new HashMap<>();
         map.put("agricultureBigDataBO",agricultureBigDataBO);
         map.put("dictList", DictUtils.getDictCache("farm_field_attribute"));
-        if (StringUtils.isEmpty(agricultureBigDataBO.getDeptId().toString())){
+        if (StringUtils.isNull(agricultureBigDataBO.getDeptId())){
             agricultureBigDataBO.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
         }
         return deptLevelUtil.getDeptLevel(agricultureBigDataMapper.getFarmlandStatistics(map),String.valueOf(agricultureBigDataBO.getDeptId()));
@@ -417,34 +417,34 @@ public class AgricultureBigDataServiceImpl extends BaseServiceImpl implements IA
         Map<String,List<Map<String, Object>>> hashMap = new HashMap<>();
         // 合作社数量
         List<Map<String, Object>> cooperativesStatisticsByCooperatives = agricultureBigDataMapper.getCooperativesStatisticsByCooperatives(agricultureBigDataBO);
-        if (StringUtils.isEmpty(agricultureBigDataBO.getDeptId().toString())){
+        if (StringUtils.isNull(agricultureBigDataBO.getDeptId())){
             agricultureBigDataBO.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
         }
         List<Map<String, Object>> cooperativesStatistics = new ArrayList<>(deptLevelUtil.getDeptLevel(cooperativesStatisticsByCooperatives,String.valueOf(agricultureBigDataBO.getDeptId())));
         // 示范级别
         List<Map<String, Object>> statisticsByLeaseTerm = agricultureBigDataMapper.getCooperativesStatisticsByLeaseTerm(agricultureBigDataBO);
-        if (StringUtils.isEmpty(agricultureBigDataBO.getDeptId().toString())){
+        if (StringUtils.isNull(agricultureBigDataBO.getDeptId())){
             agricultureBigDataBO.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
         }
         List<Map<String, Object>> statisticsByLeaseTermList = deptLevelUtil.getDeptLevel(statisticsByLeaseTerm, String.valueOf(agricultureBigDataBO.getDeptId()));
         // 成员出资额
         List<Map<String, Object>> statisticsByRegisterCapital = agricultureBigDataMapper.getCooperativesStatisticsByRegisterCapital(agricultureBigDataBO);
         int registerCapitalSum = getStatisticsSum(statisticsByRegisterCapital);
-        if (StringUtils.isEmpty(agricultureBigDataBO.getDeptId().toString())){
+        if (StringUtils.isNull(agricultureBigDataBO.getDeptId())){
             agricultureBigDataBO.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
         }
         List<Map<String, Object>> statisticsByRegisterCapitalList = deptLevelUtil.getDeptLevel(statisticsByRegisterCapital, String.valueOf(agricultureBigDataBO.getDeptId()));
         // 入社人员
         List<Map<String, Object>> statisticsByMembersNum = agricultureBigDataMapper.getCooperativesStatisticsByMembersNum(agricultureBigDataBO);
         int membersNumSum = getStatisticsSum(statisticsByMembersNum);
-        if (StringUtils.isEmpty(agricultureBigDataBO.getDeptId().toString())){
+        if (StringUtils.isNull(agricultureBigDataBO.getDeptId())){
             agricultureBigDataBO.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
         }
         List<Map<String, Object>> statisticsByMembersNumList = deptLevelUtil.getDeptLevel(statisticsByMembersNum, String.valueOf(agricultureBigDataBO.getDeptId()));
         // 带动农户
         List<Map<String, Object>> statisticsByDrivenFarmersNum = agricultureBigDataMapper.getCooperativesStatisticsByDrivenFarmersNum(agricultureBigDataBO);
         int drivenFarmersNumSum = getStatisticsSum(statisticsByDrivenFarmersNum);
-        if (StringUtils.isEmpty(agricultureBigDataBO.getDeptId().toString())){
+        if (StringUtils.isNull(agricultureBigDataBO.getDeptId())){
             agricultureBigDataBO.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
         }
         List<Map<String, Object>> statisticsByDrivenFarmersNumList = deptLevelUtil.getDeptLevel(statisticsByDrivenFarmersNum, String.valueOf(agricultureBigDataBO.getDeptId()));
@@ -540,7 +540,7 @@ public class AgricultureBigDataServiceImpl extends BaseServiceImpl implements IA
             objectObjectHashMap.put("stillAreaNum", 0);
             strawTurnover.add(objectObjectHashMap);
         }
-        if (StringUtils.isEmpty(agricultureBigDataBO.getDeptId().toString())){
+        if (StringUtils.isNull(agricultureBigDataBO.getDeptId())){
             agricultureBigDataBO.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
         }
         return deptLevelUtil.getDeptLevel(strawTurnover,String.valueOf(agricultureBigDataBO.getDeptId()));

src/main/java/com/sooka/sponest/data/digitalenvironment/service/impl/EnvironmentBigDataServiceImpl.java

@@ -173,7 +173,7 @@ public class EnvironmentBigDataServiceImpl extends BaseServiceImpl implements IE
     public List<Map<String,Object>> leaveField(EnvironmentBigDataVo environmentBigDataVo) {
         setSookaDataBase(environmentBigDataVo);
         List<Map<String,Object>> list = centerdataTEnvironmentBigDataMapper.leaveField(environmentBigDataVo);
-        if (StringUtils.isEmpty(environmentBigDataVo.getDeptId())){
+        if (StringUtils.isNotBlank(environmentBigDataVo.getDeptId())){
             environmentBigDataVo.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId().toString());
         }
         return deptLevelUtil.getDeptLevel(list,environmentBigDataVo.getDeptId());

src/main/java/com/sooka/sponest/data/digitalfirecontrol/service/impl/FireControlBigDataServiceImpl.java

@@ -120,7 +120,7 @@ public class FireControlBigDataServiceImpl extends BaseServiceImpl implements IF
     public List<Map<String,Object>> selectBigDataFirecontrolFoamLiquidDeptCount(CenterdataTFirecontrolFoamLiquid centerdataTFirecontrolFoamLiquid) {
         setSookaDataBase(centerdataTFirecontrolFoamLiquid);
         List<Map<String,Object>> mapList = fireControlBigDataMapper.selectBigDataFirecontrolFoamLiquidDeptCount(centerdataTFirecontrolFoamLiquid);
-        if (StringUtils.isEmpty(centerdataTFirecontrolFoamLiquid.getDeptId().toString())){
+        if (StringUtils.isNull(centerdataTFirecontrolFoamLiquid.getDeptId())){
             centerdataTFirecontrolFoamLiquid.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
         }
         return deptLevelUtil.getDeptLevel(mapList,String.valueOf(centerdataTFirecontrolFoamLiquid.getDeptId()));
@@ -131,7 +131,7 @@ public class FireControlBigDataServiceImpl extends BaseServiceImpl implements IF
     public List getbasiclinkageforeList(CenterdataTFirecontrolBasicLinkageForce centerdataTFirecontrolBasicLinkageForce) {
         setSookaDataBase(centerdataTFirecontrolBasicLinkageForce);
         List<Map<String,Object>> mapList = fireControlBigDataMapper.getbasiclinkageforeList(centerdataTFirecontrolBasicLinkageForce);
-        if (StringUtils.isEmpty(centerdataTFirecontrolBasicLinkageForce.getDeptId().toString())){
+        if (StringUtils.isNull(centerdataTFirecontrolBasicLinkageForce.getDeptId())){
             centerdataTFirecontrolBasicLinkageForce.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
         }
         return deptLevelUtil.getDeptLevel(mapList,String.valueOf(centerdataTFirecontrolBasicLinkageForce.getDeptId()));
@@ -165,7 +165,7 @@ public class FireControlBigDataServiceImpl extends BaseServiceImpl implements IF
     public List<Map<String,Object>> selectBigDataFireforceDeptCount(CenterdataTFirecontrolFireForce centerdataTFirecontrolFireForce) {
         setSookaDataBase(centerdataTFirecontrolFireForce);
         List<Map<String,Object>> list = fireControlBigDataMapper.selectBigDataFireforceDeptCount(centerdataTFirecontrolFireForce);
-        if (StringUtils.isEmpty(centerdataTFirecontrolFireForce.getDeptId().toString())){
+        if (StringUtils.isNull(centerdataTFirecontrolFireForce.getDeptId())){
             centerdataTFirecontrolFireForce.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
         }
         return deptLevelUtil.getDeptLevel(list,String.valueOf(centerdataTFirecontrolFireForce.getDeptId()));
@@ -179,7 +179,7 @@ public class FireControlBigDataServiceImpl extends BaseServiceImpl implements IF
     public List<Map<String,Object>> selectBigDataNumWithDeptCount(VisuForestCloudMapVO visuForestCloudMapVO) {
         setSookaDataBase(visuForestCloudMapVO);
         List<Map<String,Object>> list = fireControlBigDataMapper.selectBigDataNumWithDeptCount(visuForestCloudMapVO);
-        if (StringUtils.isEmpty(visuForestCloudMapVO.getDeptId().toString())){
+        if (StringUtils.isNull(visuForestCloudMapVO.getDeptId())){
             visuForestCloudMapVO.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
         }
         return deptLevelUtil.getDeptLevel(list,String.valueOf(visuForestCloudMapVO.getDeptId()));
@@ -196,7 +196,7 @@ public class FireControlBigDataServiceImpl extends BaseServiceImpl implements IF
     public List<Map<String,Object>> selectKeyLocations(DataVisuFireCloudMapVO dataVisuFireCloudMapVO) {
         setSookaDataBase(dataVisuFireCloudMapVO);
         List<Map<String,Object>> list = fireControlBigDataMapper.selectKeyLocations(dataVisuFireCloudMapVO);
-        if (StringUtils.isEmpty(dataVisuFireCloudMapVO.getDeptId().toString())){
+        if (StringUtils.isNull(dataVisuFireCloudMapVO.getDeptId())){
             dataVisuFireCloudMapVO.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
         }
         return deptLevelUtil.getDeptLevel(list,String.valueOf(dataVisuFireCloudMapVO.getDeptId()));

src/main/java/com/sooka/sponest/data/digitalforest/service/impl/ForestBigDataServiceImpl.java

@@ -178,7 +178,7 @@ public class ForestBigDataServiceImpl extends BaseServiceImpl implements IForest
     public List<Map<String, Object>> selectCenterdataTForestPlanHz(CenterdataTAfforestationTask centerdataTAfforestationTask) {
         setSookaDataBase(centerdataTAfforestationTask);
         List<Map<String,Object>> list = forestBigDataMapper.queryTaskArea(centerdataTAfforestationTask);
-        if (StringUtils.isEmpty(centerdataTAfforestationTask.getDeptId().toString())){
+        if (StringUtils.isNull(centerdataTAfforestationTask.getDeptId())){
             centerdataTAfforestationTask.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
         }
         return deptLevelUtil.getDeptLevel(list,String.valueOf(centerdataTAfforestationTask.getDeptId()));
@@ -196,7 +196,7 @@ public class ForestBigDataServiceImpl extends BaseServiceImpl implements IForest
     public List<Map<String, Object>> focusOnFire(CenterdataTForestKeyFireproofPlots centerdataTForestKeyFireproofPlots) {
         setSookaDataBase(centerdataTForestKeyFireproofPlots);
         List<Map<String,Object>> list = forestBigDataMapper.focusOnFire(centerdataTForestKeyFireproofPlots);
-        if (StringUtils.isEmpty(centerdataTForestKeyFireproofPlots.getDeptId().toString())){
+        if (StringUtils.isNull(centerdataTForestKeyFireproofPlots.getDeptId())){
             centerdataTForestKeyFireproofPlots.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
         }
         return deptLevelUtil.getDeptLevel(list,String.valueOf(centerdataTForestKeyFireproofPlots.getDeptId()));
@@ -207,7 +207,7 @@ public class ForestBigDataServiceImpl extends BaseServiceImpl implements IForest
     public List<Map<String,Object>> selectResourcesAreaCount(CenterdataTForestResources centerdataTForestResources) throws IOException {
         setSookaDataBase(centerdataTForestResources);
         List<Map<String,Object>> list = forestBigDataMapper.selectResourcesAreaCount(centerdataTForestResources);
-        if (StringUtils.isEmpty(centerdataTForestResources.getDeptId().toString())){
+        if (StringUtils.isNull(centerdataTForestResources.getDeptId())){
             centerdataTForestResources.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
         }
         return deptLevelUtil.getDeptLevel(list,String.valueOf(centerdataTForestResources.getDeptId()));
@@ -218,7 +218,7 @@ public class ForestBigDataServiceImpl extends BaseServiceImpl implements IForest
     public List<Map<String,Object>> selectForestGridCount(CenterdataTForestGridLevelVo centerdataTForestGridLevel) throws IOException {
         setSookaDataBase(centerdataTForestGridLevel);
         List<Map<String,Object>> list = forestBigDataMapper.selectForestGridCount(centerdataTForestGridLevel);
-        if (StringUtils.isEmpty(centerdataTForestGridLevel.getDeptId().toString())){
+        if (StringUtils.isNull(centerdataTForestGridLevel.getDeptId())){
             centerdataTForestGridLevel.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
         }
         return deptLevelUtil.getDeptLevel(list,String.valueOf(centerdataTForestGridLevel.getDeptId()));
@@ -229,7 +229,7 @@ public class ForestBigDataServiceImpl extends BaseServiceImpl implements IForest
     public List<Map<String,Object>> selectTreeCount(CenterdataTForestTrees centerdataTForestTrees) {
         setSookaDataBase(centerdataTForestTrees);
         List<Map<String,Object>> list = forestBigDataMapper.selectTreeCount(centerdataTForestTrees);
-        if (StringUtils.isEmpty(centerdataTForestTrees.getDeptId().toString())){
+        if (StringUtils.isNull(centerdataTForestTrees.getDeptId())){
             centerdataTForestTrees.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
         }
         return deptLevelUtil.getDeptLevel(list,String.valueOf(centerdataTForestTrees.getDeptId()));

src/main/java/com/sooka/sponest/data/digitalresource/service/impl/ResourceBigDataServiceImpl.java

@@ -48,8 +48,10 @@ public class ResourceBigDataServiceImpl extends BaseServiceImpl implements IReso
     public List<Map<String, Object>> selectDepositResourcesCount(CenterdataTResourcesDeposit centerdataTResourcesDeposit) {
         setSookaDataBase(centerdataTResourcesDeposit);
         List<Map<String, Object>> mapList = digitalResourcesBigDataMapper.selectDepositResourcesCount(centerdataTResourcesDeposit);
-
-        return deptLevelUtil.getDeptLevel(mapList,String.valueOf(SecurityUtils.getLoginUser().getSysUser().getDeptId()));
+        if (StringUtils.isNull(centerdataTResourcesDeposit.getDeptId())){
+            centerdataTResourcesDeposit.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
+        }
+        return deptLevelUtil.getDeptLevel(mapList,String.valueOf(centerdataTResourcesDeposit.getDeptId()));
     }
 
     /**
@@ -163,7 +165,7 @@ public class ResourceBigDataServiceImpl extends BaseServiceImpl implements IReso
         Map<String, Object> map = new HashMap<>();
         map.put("centerdataTFarmBasicFarmland",centerdataTFarmBasicFarmland);
         map.put("dictList",DictUtils.getDictCache("farm_field_attribute"));
-        if (StringUtils.isEmpty(centerdataTFarmBasicFarmland.getDeptId().toString())){
+        if (StringUtils.isNull(centerdataTFarmBasicFarmland.getDeptId())){
             centerdataTFarmBasicFarmland.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
         }
         return deptLevelUtil.getDeptLevel(digitalResourcesBigDataMapper.selectFarmBasicFarmlandCount(map),String.valueOf(centerdataTFarmBasicFarmland.getDeptId()));

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

@@ -160,7 +160,10 @@ 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.valueOf(SecurityUtils.getLoginUser().getSysUser().getDeptId()));
+        if (StringUtils.isNull(centerdataTResourcesHydroenergy.getDeptId())){
+            centerdataTResourcesHydroenergy.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
+        }
+        return deptLevelUtil.getDeptLevel(list,String.valueOf(centerdataTResourcesHydroenergy.getDeptId()));
     }