From 3245fe6c129362305ab1fc29ad38f5d45dcd49b1 Mon Sep 17 00:00:00 2001 From: 15856 <15856818120@163.com> Date: Fri, 3 Jan 2025 19:04:56 +0800 Subject: [PATCH] =?UTF-8?q?=E9=92=88=E5=AF=B9=E6=99=BA=E6=85=A7=E5=B7=A5?= =?UTF-8?q?=E5=9C=B0=E5=AF=B9=E5=85=AC=E5=8F=B8=E6=A1=86=E6=9E=B6=E8=BF=9B?= =?UTF-8?q?=E8=A1=8C=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bonus/system/api/domain/SysDept.java | 9 ++++++++- .../system/controller/SysDeptController.java | 20 ++++++++++++++++++- .../bonus/system/mapper/SysDeptMapper.java | 7 +++++++ .../bonus/system/service/ISysDeptService.java | 7 +++++++ .../service/impl/SysDeptServiceImpl.java | 6 +++++- .../resources/mapper/system/SysDeptMapper.xml | 8 +++++++- 6 files changed, 53 insertions(+), 4 deletions(-) diff --git a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysDept.java b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysDept.java index d4a1635..73d84cb 100644 --- a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysDept.java +++ b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysDept.java @@ -122,9 +122,16 @@ public class SysDept extends BaseEntity { *角色id */ private Long roleId; - + /** + * 用户信息 + */ private SysUser sysUser; + /** + * + * @param city + */ + private String keyWord; public void setCity(String city) { this.city = city; diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysDeptController.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysDeptController.java index 38432b1..8131be0 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysDeptController.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysDeptController.java @@ -136,7 +136,7 @@ public class SysDeptController extends BaseController return error("修改部门'" + dept.getDeptName() + "'失败，上级部门不能是自己"); } else if (StringUtils.equals(UserConstants.DEPT_DISABLE, dept.getStatus()) && deptService.selectNormalChildrenDeptById(deptId) > 0) { return error("该部门包含未停用的子部门！"); - }else if (StringUtils.isNotNull(dept.getSysUser()) &&!userService.checkUserNameUnique(dept.getSysUser())) { + }else if (StringUtils.isNotNull(dept.getSysUser()) && !userService.checkUserNameUnique(dept.getSysUser())) { throw new ServiceException("修改部门'" + dept.getSysUser().getUserName() + "'失败，登录账号已存在"); } else if (StringUtils.isNotEmpty(dept.getSysUser().getPhonenumber()) && !userService.checkPhoneUnique(dept.getSysUser())) { throw new ServiceException("修改部门'" + dept.getSysUser().getUserName() + "'失败，手机号码已存在"); @@ -186,4 +186,22 @@ public class SysDeptController extends BaseController } return getDataTableError(deptList); } + + /** + * 公司注销 + * @param dept + * @return + */ + @PostMapping("/deptLogout") + @SysLog(title = "运营人员获取公司列表", businessType = OperaType.UPDATE,logType = 0,module = "系统管理->部门管理") + public AjaxResult deptLogout(@Validated @RequestBody SysDept dept) { + + try{ + log.info("公司信息{}",dept.getDeptId()); + return toAjax(deptService.deptLogout(dept.getDeptId())); + }catch (Exception e){ + log.error(e.toString(),e); + } + return error("系统异常"); + } } diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/mapper/SysDeptMapper.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/mapper/SysDeptMapper.java index 467dc41..5e04d7c 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/mapper/SysDeptMapper.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/mapper/SysDeptMapper.java @@ -139,4 +139,11 @@ public interface SysDeptMapper * @return */ SysUser selectDeptAndUserById(Long deptId); + + /** + * 公司注销 + * @param deptId + * @return + */ + int deptLogout(Long deptId); } diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/ISysDeptService.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/ISysDeptService.java index 08ba2e2..73024bf 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/ISysDeptService.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/ISysDeptService.java @@ -137,4 +137,11 @@ public interface ISysDeptService * @return */ List getDeptList(SysDept dept); + + /** + * 公司注销 + * @param deptId + * @return + */ + int deptLogout(Long deptId); } diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysDeptServiceImpl.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysDeptServiceImpl.java index fafe88f..08cd3d3 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysDeptServiceImpl.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysDeptServiceImpl.java @@ -426,7 +426,7 @@ public class SysDeptServiceImpl implements ISysDeptService updateParentDeptStatusNormal(dept); } //判断是否是修改公司信息并判断是否关联用户信息 - if (systemConfig.isCreateUserAndRole() && dept.getDeptId()==0L){ + if (systemConfig.isCreateUserAndRole() && dept.getParentId()==0L){ updateUserAndRole(dept); } @@ -505,6 +505,10 @@ public class SysDeptServiceImpl implements ISysDeptService return deptMapper.getDeptList(dept); } + @Override + public int deptLogout(Long deptId) { + return deptMapper.deptLogout(deptId); + } /** diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysDeptMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysDeptMapper.xml index 67e51e5..3980642 100644 --- a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysDeptMapper.xml +++ b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysDeptMapper.xml @@ -146,7 +146,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where dept_name=#{deptName} and parent_id = #{parentId} and del_flag = '0' limit 1