From e62a448eb6304031fca1a030586563fbbe053419 Mon Sep 17 00:00:00 2001 From: zzl <961867786@qq.com> Date: Wed, 3 Sep 2025 16:00:57 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=8C=E6=94=BF=E5=8C=BA=E5=88=92=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=EF=BC=8C=E4=B8=BA=E7=94=A8=E6=88=B7=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E5=81=9A=E9=93=BA=E5=9E=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/system/SysDeptController.java | 12 ++++++++++++ .../common/core/domain/entity/SysDept.java | 2 +- .../common/core/domain/entity/SysUser.java | 17 ++++++++++------- .../system/service/impl/SysDeptServiceImpl.java | 14 +++++++------- 4 files changed, 30 insertions(+), 15 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java index ff6385a..d60e143 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java +++ b/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 list = deptService.selectDeptList(dept); + ExcelUtil util = new ExcelUtil(SysDept.class); + util.exportExcel(response, list, "行政区划"); + } + /** * 根据部门编号获取详细信息 */ diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java index 48827c5..f34b42c 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java +++ b/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 */ diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java index d133ee8..6de5e13 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java +++ b/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; /** 用户账号 */ diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java index 0b0dbe2..cf811ed 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java +++ b/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 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)) {