角色删除

tnc-system/src/main/java/org/jeecg/modules/system/controller/SysRoleController.java

@@ -226,13 +226,8 @@ public class SysRoleController {
 		if (!pageList.getRecords().isEmpty()){
 			return Result.error("角色下还有用户不可删除!!!");
 		}
-		boolean b = sysRoleService.deleteRole(id);
-		if (b){
-			return Result.ok("删除角色成功");
-		}else {
-			return Result.error("角色下还有用户 不可删除");
-		}
-
+		 sysRoleService.deleteRole(id);
+		return Result.ok("删除角色成功");
 	}
 	
 	/**

tnc-system/src/main/java/org/jeecg/modules/system/service/impl/SysRoleServiceImpl.java

@@ -70,8 +70,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
     @Override
     @Transactional(rollbackFor = Exception.class)
     public boolean deleteRole(String roleid) {
-        Integer i = sysRoleMapper.selectRoleUserRelation(roleid);
-        if (i==0){
+
             //1.删除角色和用户关系
             sysRoleMapper.deleteRoleUserRelation(roleid);
             //2.删除角色和权限关系
@@ -79,10 +78,6 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
             //3.删除角色
             this.removeById(roleid);
             return true;
-        }else {
-            return false;
-        }
-
     }
 
     @Override