|
@@ -3,21 +3,16 @@ package com.imed.costaccount.service.impl;
|
|
|
import cn.hutool.core.collection.CollUtil;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
-import com.imed.costaccount.common.util.PageUtils;
|
|
|
import com.imed.costaccount.mapper.UserRoleMapper;
|
|
|
import com.imed.costaccount.model.UserRole;
|
|
|
import com.imed.costaccount.model.dto.RoleUserDTO;
|
|
|
-import com.imed.costaccount.model.vo.CommonSelectVO;
|
|
|
import com.imed.costaccount.model.vo.CommonVO;
|
|
|
-import com.imed.costaccount.model.vo.UserVO;
|
|
|
import com.imed.costaccount.service.UserRoleService;
|
|
|
import com.imed.costaccount.service.UserService;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Propagation;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
-import java.util.ArrayList;
|
|
|
-import java.util.Collections;
|
|
|
import java.util.List;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
@@ -69,8 +64,7 @@ public class UserRoleServiceImpl extends ServiceImpl<UserRoleMapper, UserRole> i
|
|
|
// this.removeById(roleId);
|
|
|
List<Long> userIds = roleUserDTO.getUserIds();
|
|
|
this.remove(
|
|
|
- new LambdaQueryWrapper<UserRole>().in(UserRole::getUserId, userIds).eq(UserRole::getRoleId, roleId)
|
|
|
- );
|
|
|
+ new LambdaQueryWrapper<UserRole>().eq(UserRole::getRoleId, roleId));
|
|
|
if (CollUtil.isNotEmpty(userIds)) {
|
|
|
List<UserRole> userRoles = userIds.stream().map(i -> {
|
|
|
UserRole userRole = new UserRole();
|