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 0136084b..3bf01f91 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 @@ -56,7 +56,7 @@ public class DepartmentController extends ControllerBase { */ @GetMapping("getChild") @ApiMark(moduleName = "部门管理", apiName = "获取子级") - public ApiResult> getChild(@RequestParam("parentId") Integer parentId ){ + public ApiResult> getChild(@RequestParam("parentId") Long parentId ){ return ApiResult.success(departmentService.getChildByParentId(parentId)); } @@ -99,7 +99,7 @@ public class DepartmentController extends ControllerBase { @PostMapping("del") @MethodInfoMark(value = "删除",menuName = "部门管理") @ApiMark(moduleName = "部门管理", apiName = "删除") - public ApiResult add(@RequestBody List ids ){ + public ApiResult add(@RequestBody List ids ){ VUtils.trueThrowBusinessError(CollUtil.isEmpty(ids)).throwMessage("请选择要删除的数据"); departmentService.del(ids); return ApiResult.success(true); diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/TBaseDepartmentMapper.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/TBaseDepartmentMapper.java index 76fd3510..13f44e58 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/TBaseDepartmentMapper.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/TBaseDepartmentMapper.java @@ -20,5 +20,5 @@ public interface TBaseDepartmentMapper extends BaseMapper { Page selectListByPage(@Param("page") Page page,@Param("query") PageBaseQuery query ); - void del(@Param("ids") List ids); + void del(@Param("ids") List ids); } diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/ITBaseDepartmentService.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/ITBaseDepartmentService.java index ad901eeb..7111c7fe 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/ITBaseDepartmentService.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/ITBaseDepartmentService.java @@ -25,9 +25,9 @@ public interface ITBaseDepartmentService extends IService { Boolean saveDepartment(TBaseDepartment department); - void del(List ids); + void del(List ids); - List getChildByParentId(Integer id); + List getChildByParentId(Long id); List getSimpleDepartments(); } diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TBaseDepartmentServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TBaseDepartmentServiceImpl.java index 50322615..8a9f23e0 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TBaseDepartmentServiceImpl.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TBaseDepartmentServiceImpl.java @@ -35,11 +35,11 @@ public class TBaseDepartmentServiceImpl extends ServiceImpl ids) { + public void del(List ids) { this.getBaseMapper().del(ids); } - public List getChildByParentId(Integer id) { + public List getChildByParentId(Long id) { return this.lambdaQuery().eq(TBaseDepartment::getDeptParentId, id).list(); } diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/TBaseDepartmentMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/TBaseDepartmentMapper.xml index 7d4b4373..109e7769 100644 --- a/nflg-mobilebroken-repository/src/main/resources/mapper/TBaseDepartmentMapper.xml +++ b/nflg-mobilebroken-repository/src/main/resources/mapper/TBaseDepartmentMapper.xml @@ -20,10 +20,10 @@ - - update t_base_department set data_valid_status=0 where id in + + delete from t_base_department where id in #{item} - +