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

src/main/java/com/sooka/sponest/data/utils/DeptLevelUtil.java

@@ -1,19 +1,19 @@
 package com.sooka.sponest.data.utils;
 
-import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.system.api.RemoteDeptService;
 import com.ruoyi.system.api.domain.SysDept;
-import com.sooka.sponest.data.digitalemergency.controller.CenterdataTEmergencyEnterindesmapController;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-import org.springframework.util.ObjectUtils;
 
 import java.math.BigDecimal;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 @Component
 public class DeptLevelUtil {
@@ -27,7 +27,7 @@ public class DeptLevelUtil {
         if (StringUtils.isEmpty(deptId)||"null".equals(deptId)){
             deptId = SecurityUtils.getLoginUser().getSysUser().getDeptId().toString();
         }
-        List<SysDept> sysDeptList = remoteDeptService.selectChildrenCountyOrVillagesDeptListByDeptId(deptId).getData();
+        List<SysDept> sysDeptList = remoteDeptService .selectChildrenCountyOrVillagesDeptListByDeptId(deptId).getData();
         if (StringUtils.isEmpty(list)){
             return null;
         }