diff --git a/tall/src/main/java/com/ccsens/tall/service/ProRoleService.java b/tall/src/main/java/com/ccsens/tall/service/ProRoleService.java index 2f40558c..89cef7f2 100644 --- a/tall/src/main/java/com/ccsens/tall/service/ProRoleService.java +++ b/tall/src/main/java/com/ccsens/tall/service/ProRoleService.java @@ -26,9 +26,7 @@ import org.springframework.transaction.annotation.Transactional; import org.w3c.dom.ls.LSInput; import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; +import java.util.*; import java.util.stream.Collectors; /** @@ -1045,8 +1043,11 @@ public class ProRoleService implements IProRoleService { proMemberRoleShowMapper.updateByPrimaryKeySelective(roleShow); }); } + //去重操作 + List roleIds = param.getParam().getRoleIds().stream() + .collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(RoleDto.RoleAndType::getRoleId))), ArrayList::new)); //根据前端传的数据,循环放入,并排序 - for (int i = 0; i < param.getParam().getRoleIds().size(); i++) { + for (int i = 0; i < roleIds.size(); i++) { // Long roleId = param.getParam().getRoleIds().get(i); RoleDto.RoleAndType roleAndType = param.getParam().getRoleIds().get(i); ProMemberRoleShow proMemberRoleShow = new ProMemberRoleShow(); @@ -1058,6 +1059,19 @@ public class ProRoleService implements IProRoleService { proMemberRoleShowMapper.insertSelective(proMemberRoleShow); } + //根据前端传的数据,循环放入,并排序 +// for (int i = 0; i < param.getParam().getRoleIds().size(); i++) { +// Long roleId = param.getParam().getRoleIds().get(i); +// RoleDto.RoleAndType roleAndType = param.getParam().getRoleIds().get(i); +// ProMemberRoleShow proMemberRoleShow = new ProMemberRoleShow(); +// proMemberRoleShow.setId(snowflake.nextId()); +// proMemberRoleShow.setMemberId(memberId); +// proMemberRoleShow.setRoleId(roleAndType.getRoleId()); +// proMemberRoleShow.setRoleType(roleAndType.getRoleType()); +// proMemberRoleShow.setSequence(i); +// proMemberRoleShowMapper.insertSelective(proMemberRoleShow); +// } + // // if(param.getParam().getRoleIds().size()<=1){