mirage
/
edu
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

调整部门和岗位的删除验证

This commit is contained in:
TinyAnts 2022-06-07 16:42:42 +08:00
parent d4d31f2953
commit b23076334c
2 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemDeptServiceImpl.java
View File

@ -6,7 +6,9 @@ import com.baomidou.mybatisplus.core.toolkit.Assert;
import com.hxkj.admin.service.ISystemDeptService; import com.hxkj.admin.service.ISystemDeptService;
import com.hxkj.admin.validate.system.SystemDeptParam; import com.hxkj.admin.validate.system.SystemDeptParam;
import com.hxkj.admin.vo.system.SystemDeptVo; 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.entity.system.SystemDept;
import com.hxkj.common.mapper.system.SystemAdminMapper;
import com.hxkj.common.mapper.system.SystemDeptMapper; import com.hxkj.common.mapper.system.SystemDeptMapper;
import com.hxkj.common.utils.ArrayUtil; import com.hxkj.common.utils.ArrayUtil;
import com.hxkj.common.utils.TimeUtil; import com.hxkj.common.utils.TimeUtil;
@ -25,6 +27,9 @@ public class SystemDeptServiceImpl implements ISystemDeptService {
@Resource @Resource
SystemDeptMapper systemDeptMapper; SystemDeptMapper systemDeptMapper;
@Resource
SystemAdminMapper systemAdminMapper;
/** /**
* 岗位所有 * 岗位所有
* *
@ -197,6 +202,14 @@ public class SystemDeptServiceImpl implements ISystemDeptService {
Assert.notNull(model, "部门不存在"); Assert.notNull(model, "部门不存在");
Assert.isFalse((model.getPid() == 0), "顶级部门不能删除"); Assert.isFalse((model.getPid() == 0), "顶级部门不能删除");
SystemAdmin systemAdmin = systemAdminMapper.selectOne(new QueryWrapper<SystemAdmin>()
.select("id,nickname")
.eq("dept_id", id)
.eq("is_delete", 0)
.last("limit 1"));
Assert.isNull(systemAdmin, "该部门已被“"+systemAdmin.getNickname()+"”管理员使用,请先移除");
model.setIsDelete(1); model.setIsDelete(1);
model.setDeleteTime(System.currentTimeMillis() / 1000); model.setDeleteTime(System.currentTimeMillis() / 1000);
systemDeptMapper.updateById(model); systemDeptMapper.updateById(model);

13
server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemPostService.java
View File

@ -9,7 +9,9 @@ import com.hxkj.admin.validate.PageParam;
import com.hxkj.admin.validate.system.SystemPostParam; import com.hxkj.admin.validate.system.SystemPostParam;
import com.hxkj.admin.vo.system.SystemPostVo; import com.hxkj.admin.vo.system.SystemPostVo;
import com.hxkj.common.core.PageResult; import com.hxkj.common.core.PageResult;
import com.hxkj.common.entity.system.SystemAdmin;
import com.hxkj.common.entity.system.SystemPost; 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.mapper.system.SystemPostMapper;
import com.hxkj.common.utils.TimeUtil; import com.hxkj.common.utils.TimeUtil;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
@ -27,6 +29,9 @@ public class SystemPostService implements ISystemPostService {
@Resource @Resource
SystemPostMapper systemPostMapper; SystemPostMapper systemPostMapper;
@Resource
SystemAdminMapper systemAdminMapper;
/** /**
* 岗位所有 * 岗位所有
* *
@ -204,6 +209,14 @@ public class SystemPostService implements ISystemPostService {
Assert.notNull(model, "岗位不存在"); Assert.notNull(model, "岗位不存在");
SystemAdmin systemAdmin = systemAdminMapper.selectOne(new QueryWrapper<SystemAdmin>()
.select("id,nickname")
.eq("post_id", id)
.eq("is_delete", 0)
.last("limit 1"));
Assert.isNull(systemAdmin, "该岗位已被“"+systemAdmin.getNickname()+"”管理员使用,请先移除");
model.setIsDelete(1); model.setIsDelete(1);
model.setDeleteTime(System.currentTimeMillis() / 1000); model.setDeleteTime(System.currentTimeMillis() / 1000);
systemPostMapper.updateById(model); systemPostMapper.updateById(model);