physical3/physical-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
ls
2024-11-26 18:17:12 +08:00
parent 0f7d2075a9
commit 12fd3bb863
3 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/controller/SysRoleController.java
View File

@@ -218,6 +218,7 @@ public class SysRoleController {
//update-begin---author:wangshuai---date:2024-01-16---for:【QQYUN-7974】禁止删除 admin 角色---
//是否存在admin角色
sysRoleService.checkAdminRoleRejectDel(id);
sysRoleService.checkRoleUsed(id);
//update-end---author:wangshuai---date:2024-01-16---for:【QQYUN-7974】禁止删除 admin 角色---
sysRoleService.deleteRole(id);

2
physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/service/ISysRoleService.java
View File

@@ -74,4 +74,6 @@ public interface ISysRoleService extends IService<SysRole> {
* @param ids
*/
void checkAdminRoleRejectDel(String ids);
void checkRoleUsed(String id);
}

11
physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysRoleServiceImpl.java
View File

@@ -1,6 +1,7 @@
package org.jeecg.modules.system.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.common.api.vo.Result;
@@ -9,6 +10,7 @@ import org.jeecg.common.constant.SymbolConstant;
import org.jeecg.common.exception.JeecgBootException;
import org.jeecg.common.util.ImportExcelUtil;
import org.jeecg.modules.system.entity.SysRole;
import org.jeecg.modules.system.entity.SysUser;
import org.jeecg.modules.system.mapper.SysRoleMapper;
import org.jeecg.modules.system.mapper.SysUserMapper;
import org.jeecg.modules.system.service.ISysRoleService;
@@ -116,4 +118,13 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
throw new JeecgBootException("admin角色，不允许删除！");
}
}
@Override
public void checkRoleUsed(String roleId) {
Page<SysUser> page = new Page<>(1, 10000);
IPage<SysUser> userRoleList = sysUserMapper.getUserByRoleId(page, roleId, null, null);
if (userRoleList.getTotal() > 0) {
throw new JeecgBootException("角色已被用户使用，不允许删除！");
}
}
}