From 01664d1cbc5bb086a0f4b29933e05289346b6419 Mon Sep 17 00:00:00 2001 From: luolm <470431449@qq.com> Date: Sat, 15 Feb 2025 16:41:09 +0800 Subject: [PATCH] =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/controller/BaseAreaController.java | 4 ++-- .../admin/controller/DepartmentController.java | 4 ++-- .../mobilebroken/admin/pojo/dto/DepartmentDTO.java | 4 ++-- .../admin/service/AdminDepartmentService.java | 12 ++++++------ .../common/pojo/vo/DepartmentSimpleVO.java | 2 +- .../repository/entity/TBaseDepartment.java | 4 ++-- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/BaseAreaController.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/BaseAreaController.java index 1bec3c42..f339c458 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/BaseAreaController.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/BaseAreaController.java @@ -120,8 +120,8 @@ public class BaseAreaController extends ControllerBase { @ApiMark(moduleName = "区域管理", apiName = "删除") public ApiResult del(@RequestBody List ids){ VUtils.trueThrow(CollUtil.isEmpty(ids)).throwMessage(STATE.ParamErr,"请选择要删除的行"); - - baseAreaService.delByIds(ids, AdminUserUtil.getUserNo(), AdminUserUtil.getUserName()); + baseAreaService.getBaseMapper().deleteByIds(ids); +// baseAreaService.delByIds(ids, AdminUserUtil.getUserNo(), AdminUserUtil.getUserName()); return ApiResult.success(true); } diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DepartmentController.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DepartmentController.java index 20de8061..0136084b 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DepartmentController.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DepartmentController.java @@ -139,11 +139,11 @@ public class DepartmentController extends ControllerBase { @PostMapping("disable") @MethodInfoMark(value = "禁用",menuName = "部门管理") @ApiMark(moduleName = "部门管理", apiName = "禁用") - public ApiResult disable(@RequestBody List ids ){ + public ApiResult disable(@RequestBody List ids ){ VUtils.trueThrowBusinessError(CollUtil.isEmpty(ids)).throwMessage("请选择要启用的数据"); List tBaseDepartments = departmentService.getBaseMapper().selectByIds(ids); - List childIds=new ArrayList<>(); + List childIds=new ArrayList<>(); childIds.addAll(ids); for (TBaseDepartment tBaseDepartment : tBaseDepartments) { adminDepartmentService.getAllChildIds(tBaseDepartment, childIds); diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/dto/DepartmentDTO.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/dto/DepartmentDTO.java index 78180881..88be76aa 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/dto/DepartmentDTO.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/dto/DepartmentDTO.java @@ -7,7 +7,7 @@ import javax.validation.constraints.NotBlank; @Data public class DepartmentDTO { - private Integer id; + private Long id; @NotBlank(message = "编码不能为空") private String deptCode; @@ -16,5 +16,5 @@ public class DepartmentDTO { private String deptName; - private Integer deptParentId=0; + private Long deptParentId=0L; } diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/service/AdminDepartmentService.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/service/AdminDepartmentService.java index 5be3a4f7..0c12a969 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/service/AdminDepartmentService.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/service/AdminDepartmentService.java @@ -29,7 +29,7 @@ public class AdminDepartmentService { List dataResult = Convert.toList(BaseDepartmentVO.class, result.getRecords()); if(StrUtil.isNotBlank(query.getDeptCodeOrName())){ List alldept = Convert.toList(BaseDepartmentVO.class,departmentService.lambdaQuery().eq(TBaseDepartment::getDataValidStatus,1).list()) ; - Map collect = alldept.stream().collect(Collectors.toMap(BaseDepartmentVO::getId, Function.identity())); + Map collect = alldept.stream().collect(Collectors.toMap(BaseDepartmentVO::getId, Function.identity())); List allParents=new ArrayList<>(); for (BaseDepartmentVO data:dataResult){ allParents.addAll(getAllParents(data, collect)) ; @@ -48,7 +48,7 @@ public class AdminDepartmentService { } - public List getAllChildIds(TBaseDepartment vo ,List ids){ + public List getAllChildIds(TBaseDepartment vo ,List ids){ List immediateChildren = findChildDepartmentsByParentId(vo.getId()); ids.addAll(immediateChildren.stream().map(u->u.getId()).collect(Collectors.toSet())); for (BaseDepartmentVO child : immediateChildren) { @@ -68,15 +68,15 @@ public class AdminDepartmentService { } } - private List findChildDepartmentsByParentId(int parentId) { + private List findChildDepartmentsByParentId(Long parentId) { List depts = departmentService.lambdaQuery().eq(TBaseDepartment::getDeptParentId, parentId).eq(TBaseDepartment::getDataValidStatus,1).list(); return Convert.toList(BaseDepartmentVO.class,depts); } - private List getAllParents(BaseDepartmentVO node, Map idToNodeMap) { + private List getAllParents(BaseDepartmentVO node, Map idToNodeMap) { List parents = new ArrayList<>(); - Integer parentId = node.getDeptParentId(); + Long parentId = node.getDeptParentId(); while (parentId != null && parentId>0) { BaseDepartmentVO parentNode = idToNodeMap.get(parentId); if (parentNode == null) break; // 防止数据不一致导致无限循环 @@ -94,7 +94,7 @@ public class AdminDepartmentService { */ private List buildTree(List nodes) { // 使用Map存储id到Node的映射，便于快速查找父节点 - Map idToNodeMap = nodes.stream() + Map idToNodeMap = nodes.stream() .collect(Collectors.toMap(BaseDepartmentVO::getId, Function.identity())); List roots = new ArrayList<>(); diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/DepartmentSimpleVO.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/DepartmentSimpleVO.java index 29154205..69606a27 100644 --- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/DepartmentSimpleVO.java +++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/DepartmentSimpleVO.java @@ -10,7 +10,7 @@ import java.util.List; public class DepartmentSimpleVO { // 部门id - private Integer id; + private Long id; //部门名称 private String name; diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/TBaseDepartment.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/TBaseDepartment.java index 1587b740..781408aa 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/TBaseDepartment.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/TBaseDepartment.java @@ -29,7 +29,7 @@ public class TBaseDepartment implements Serializable { * id 自增id */ @TableId(value = "id", type = IdType.AUTO) - private Integer id; + private Long id; /** * 部门编码 @@ -44,7 +44,7 @@ public class TBaseDepartment implements Serializable { /** * 部门父类ID */ - private Integer deptParentId; + private Long deptParentId; /** * 状态 0-禁用 1-启用