修改bug

master
wangwei 2 years ago
parent 30eda1c060
commit 91e4a9021e

@ -133,7 +133,10 @@ public class SysRoleController extends BaseController {
@DeleteMapping("/{roleIds}") @DeleteMapping("/{roleIds}")
public BaseResponse remove(@PathVariable Long[] roleIds) { public BaseResponse remove(@PathVariable Long[] roleIds) {
int i = roleService.deleteRoleByIds(roleIds); int i = roleService.deleteRoleByIds(roleIds);
return ResultVOUtils.success("修改成功!"); if(i>0){
return ResultVOUtils.success("修改成功!");
}
return ResultVOUtils.error(500,"已绑定用户,不能删除!");
} }
/** /**

@ -4,6 +4,8 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.Constant; import com.glxp.api.constant.Constant;
import com.glxp.api.dao.auth.SysRoleMapper; import com.glxp.api.dao.auth.SysRoleMapper;
import com.glxp.api.dao.auth.SysRoleMenuMapper; import com.glxp.api.dao.auth.SysRoleMenuMapper;
@ -318,18 +320,27 @@ public class SysRoleServiceImpl implements ISysRoleService {
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public int deleteRoleByIds(Long[] roleIds) { public int deleteRoleByIds(Long[] roleIds) {
int i=0;
for (Long roleId : roleIds) { for (Long roleId : roleIds) {
checkRoleAllowed(new SysRole(roleId)); checkRoleAllowed(new SysRole(roleId));
checkRoleDataScope(roleId); checkRoleDataScope(roleId);
SysRole role = selectRoleById(roleId); SysRole role = selectRoleById(roleId);
if (countUserRoleByRoleId(roleId) > 0) { if (countUserRoleByRoleId(roleId) > 0) {
throw new ServiceException(String.format("%1$s已分配,不能删除", role.getRoleName())); i++;
// throw new ServiceException(String.format("%1$s已分配,不能删除", role.getRoleName()));
} }
} }
List<Long> ids = Arrays.asList(roleIds); if(i>0){
// 删除角色与菜单关联 return 0;
roleMenuMapper.deleteByList(ids); }else{
return sysRoleMapper.deleteBatchIds(ids); List<Long> ids = Arrays.asList(roleIds);
// 删除角色与菜单关联
roleMenuMapper.deleteByList(ids);
sysRoleMapper.deleteBatchIds(ids);
return sysRoleMapper.deleteBatchIds(ids);
}
} }
/** /**

Loading…
Cancel
Save