|
@@ -237,7 +237,7 @@ public class TenantServiceImpl implements TenantService {
|
|
|
//去掉的菜单id(需要删除的)
|
|
|
List<Integer> deleteTenantMenuIds = oldTenantMenuIds.stream().filter(item -> !newTenantMenuIds.contains(item)).collect(Collectors.toList());
|
|
|
if(deleteTenantMenuIds.size()>0){
|
|
|
- tenantMapper.deleteTenantMenuIds(tenantDto.getId(),deleteTenantMenuIds);
|
|
|
+ tenantMapper.deleteTenantMenuIds(tenantDto.getCode(),deleteTenantMenuIds);
|
|
|
}
|
|
|
//修改管理员信息
|
|
|
UserEntity userEntity =userMapper.findUserById(tenantDto.getUserId());
|
|
@@ -281,8 +281,9 @@ public class TenantServiceImpl implements TenantService {
|
|
|
*/
|
|
|
@Override
|
|
|
public int deleteById(Integer id) {
|
|
|
+ TenantDto tenantDto = tenantMapper.selectById(id);
|
|
|
//先删除租户菜单
|
|
|
- tenantMapper.deleteTenantMenuIds(id,null);
|
|
|
+ tenantMapper.deleteTenantMenuIds(tenantDto.getCode(),null);
|
|
|
//删除用户信息
|
|
|
tenantMapper.deleteUserByTenantId(id);
|
|
|
return tenantMapper.deleteById(id);
|