行政区划导出，为用户导入做铺垫

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java

@@ -60,6 +60,18 @@ public class SysDeptController extends BaseController {
         return success(depts);
     }
 
+    /**
+     * 导出部门列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:dept:export')")
+    @Log(title = "手机菜单", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SysDept dept) {
+        List<SysDept> list = deptService.selectDeptList(dept);
+        ExcelUtil<SysDept> util = new ExcelUtil<SysDept>(SysDept.class);
+        util.exportExcel(response, list, "行政区划");
+    }
+
     /**
      * 根据部门编号获取详细信息
      */

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java

@@ -22,7 +22,7 @@ public class SysDept extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 部门ID */
-    @Excel(name = "部门ID", type = Excel.Type.EXPORT)
+    @Excel(name = "行政区划ID", type = Excel.Type.EXPORT)
     private Long deptId;
 
     /** 父部门ID */

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java

@@ -1,20 +1,23 @@
 package com.ruoyi.common.core.domain.entity;
 
-import java.util.Date;
-import java.util.List;
-import javax.validation.constraints.*;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.annotation.Excel.ColumnType;
 import com.ruoyi.common.annotation.Excel.Type;
 import com.ruoyi.common.annotation.Excels;
 import com.ruoyi.common.core.domain.BaseEntity;
 import com.ruoyi.common.xss.Xss;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import javax.validation.constraints.Email;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+import java.util.Date;
+import java.util.List;
 
 /**
  * 用户对象 sys_user
- * 
+ *
  * @author ruoyi
  */
 public class SysUser extends BaseEntity
@@ -26,7 +29,7 @@ public class SysUser extends BaseEntity
     private Long userId;
 
     /** 部门ID */
-    @Excel(name = "部门编号", type = Type.IMPORT)
+    @Excel(name = "行政区划ID", type = Type.IMPORT)
     private Long deptId;
 
     /** 用户账号 */

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java

@@ -375,7 +375,7 @@ public class SysDeptServiceImpl implements ISysDeptService {
         }
 
         // 初始化清空表
-        if (!isUpdateSupport)
+        if (isUpdateSupport)
             deptMapper.deleteAllDept(); // 事务
 
         final Consumer<SysDept> updateOrInsertFunc = (dept) -> {
@@ -397,7 +397,7 @@ public class SysDeptServiceImpl implements ISysDeptService {
         orgCodeLengthMap.forEach((orgCodeLength, sysDepts) -> {
             switch (orgCodeLength) {
                 case 2:
-                    if (isUpdateSupport) {
+                    if (!isUpdateSupport) {
                         sysDepts.forEach((x) -> {
                             SysDept dept = deptMapper.selectDeptByImportCode(x.getImportCode());
                             if (null != dept) // 存在则更新名称
@@ -424,7 +424,7 @@ public class SysDeptServiceImpl implements ISysDeptService {
                     }
                     break;
                 case 4:
-                    if (isUpdateSupport) {
+                    if (!isUpdateSupport) {
                         sysDepts.forEach(sysDept -> {
                             SysDept parentDept = deptMapper.selectDeptByImportCode(StringUtils.substring(sysDept.getImportCode(), 0, 2));
                             if (Objects.nonNull(parentDept)) {
@@ -459,7 +459,7 @@ public class SysDeptServiceImpl implements ISysDeptService {
                     }
                     break;
                 case 6:
-                    if (isUpdateSupport) {
+                    if (!isUpdateSupport) {
                         orderNnum.set(0);
                         sysDepts.forEach(sysDept -> {
                             SysDept parentDept = deptMapper.selectDeptByImportCode(StringUtils.substring(sysDept.getImportCode(), 0, 4));
@@ -495,7 +495,7 @@ public class SysDeptServiceImpl implements ISysDeptService {
                     }
                     break;
                 case 9:
-                    if (isUpdateSupport) {
+                    if (!isUpdateSupport) {
                         sysDepts.forEach(sysDept -> {
                             SysDept parentDept = deptMapper.selectDeptByImportCode(StringUtils.substring(sysDept.getImportCode(), 0, 6));
                             if (Objects.nonNull(parentDept)) {
@@ -526,7 +526,7 @@ public class SysDeptServiceImpl implements ISysDeptService {
                     }
                     break;
                 case 12:
-                    if (isUpdateSupport) {
+                    if (!isUpdateSupport) {
                         sysDepts.forEach(sysDept -> {
                             SysDept parentDept = deptMapper.selectDeptByImportCode(StringUtils.substring(sysDept.getImportCode(), 0, 9));
                             if (Objects.nonNull(parentDept)) {
@@ -557,7 +557,7 @@ public class SysDeptServiceImpl implements ISysDeptService {
                     }
                     break;
                 case 14:
-                    if (isUpdateSupport) {
+                    if (!isUpdateSupport) {
                         sysDepts.forEach(sysDept -> {
                             SysDept parentDept = deptMapper.selectDeptByImportCode(StringUtils.substring(sysDept.getImportCode(), 0, 12));
                             if (Objects.nonNull(parentDept)) {