From b23076334cf91ec491e4ab9db86cfe879a32f0bc Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Tue, 7 Jun 2022 16:42:42 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=83=A8=E9=97=A8=E5=92=8C?= =?UTF-8?q?=E5=B2=97=E4=BD=8D=E7=9A=84=E5=88=A0=E9=99=A4=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/service/impl/SystemDeptServiceImpl.java | 13 +++++++++++++ .../hxkj/admin/service/impl/SystemPostService.java | 13 +++++++++++++ 2 files changed, 26 insertions(+) diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemDeptServiceImpl.java b/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemDeptServiceImpl.java index 87c8beac..41fe990d 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemDeptServiceImpl.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemDeptServiceImpl.java @@ -6,7 +6,9 @@ import com.baomidou.mybatisplus.core.toolkit.Assert; import com.hxkj.admin.service.ISystemDeptService; import com.hxkj.admin.validate.system.SystemDeptParam; import com.hxkj.admin.vo.system.SystemDeptVo; +import com.hxkj.common.entity.system.SystemAdmin; import com.hxkj.common.entity.system.SystemDept; +import com.hxkj.common.mapper.system.SystemAdminMapper; import com.hxkj.common.mapper.system.SystemDeptMapper; import com.hxkj.common.utils.ArrayUtil; import com.hxkj.common.utils.TimeUtil; @@ -25,6 +27,9 @@ public class SystemDeptServiceImpl implements ISystemDeptService { @Resource SystemDeptMapper systemDeptMapper; + @Resource + SystemAdminMapper systemAdminMapper; + /** * 岗位所有 * @@ -197,6 +202,14 @@ public class SystemDeptServiceImpl implements ISystemDeptService { Assert.notNull(model, "部门不存在"); Assert.isFalse((model.getPid() == 0), "顶级部门不能删除"); + SystemAdmin systemAdmin = systemAdminMapper.selectOne(new QueryWrapper() + .select("id,nickname") + .eq("dept_id", id) + .eq("is_delete", 0) + .last("limit 1")); + + Assert.isNull(systemAdmin, "该部门已被“"+systemAdmin.getNickname()+"”管理员使用,请先移除"); + model.setIsDelete(1); model.setDeleteTime(System.currentTimeMillis() / 1000); systemDeptMapper.updateById(model); diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemPostService.java b/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemPostService.java index e7d27f6b..4a8494f9 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemPostService.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemPostService.java @@ -9,7 +9,9 @@ import com.hxkj.admin.validate.PageParam; import com.hxkj.admin.validate.system.SystemPostParam; import com.hxkj.admin.vo.system.SystemPostVo; import com.hxkj.common.core.PageResult; +import com.hxkj.common.entity.system.SystemAdmin; import com.hxkj.common.entity.system.SystemPost; +import com.hxkj.common.mapper.system.SystemAdminMapper; import com.hxkj.common.mapper.system.SystemPostMapper; import com.hxkj.common.utils.TimeUtil; import org.springframework.beans.BeanUtils; @@ -27,6 +29,9 @@ public class SystemPostService implements ISystemPostService { @Resource SystemPostMapper systemPostMapper; + @Resource + SystemAdminMapper systemAdminMapper; + /** * 岗位所有 * @@ -204,6 +209,14 @@ public class SystemPostService implements ISystemPostService { Assert.notNull(model, "岗位不存在"); + SystemAdmin systemAdmin = systemAdminMapper.selectOne(new QueryWrapper() + .select("id,nickname") + .eq("post_id", id) + .eq("is_delete", 0) + .last("limit 1")); + + Assert.isNull(systemAdmin, "该岗位已被“"+systemAdmin.getNickname()+"”管理员使用,请先移除"); + model.setIsDelete(1); model.setDeleteTime(System.currentTimeMillis() / 1000); systemPostMapper.updateById(model);