weizhiqiang1995/erp-pro
1
1
Fork 0
mirror of https://github.com/weizhiqiang1995/erp-pro.git synced 2025-01-08 16:27:35 +08:00
Code Issues Projects Releases Packages Wiki Activity

解决团队模板的bug

Browse source
This commit is contained in:
weizhiqiang 2022-12-10 14:30:19 +08:00
parent 5fe892cb33
commit 18fc5880e0
3 changed files with 26 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
skyeye-promote/skyeye-base-server/src/main/java/com/skyeye/team/service/impl/AbstractTeamServiceImpl.java
View file

@ -49,7 +49,11 @@ public class AbstractTeamServiceImpl<D extends SkyeyeBaseMapper<T>, T extends Ab
String teamId = entity.getId();
List<TeamRole> teamRoleList = entity.getTeamRoleList();
String serviceClassName = getServiceClassName();
saveNewTeamRole(teamId, teamRoleList, serviceClassName, userId);
if (CollectionUtil.isNotEmpty(teamRoleList)) {
saveRole(userId, teamId, teamRoleList, serviceClassName);
}
// 修改团队用户信息
updateRoleUser(userId, teamId, teamRoleList, serviceClassName, new ArrayList<>());
if (CollectionUtil.isNotEmpty(entity.getTeamObjectPermissionList())) {
saveTeamOwnerPermission(teamId, serviceClassName, userId, entity.getTeamObjectPermissionList());
@ -69,7 +73,7 @@ public class AbstractTeamServiceImpl<D extends SkyeyeBaseMapper<T>, T extends Ab
updateRole(userId, teamId, newTeamRoleList, serviceClassName, oldTeamRoleList, oldRoleKeys);
// 修改团队用户信息
updateRoleUser(userId, teamId, newTeamRoleList, serviceClassName, oldRoleKeys);
updateRoleUser(userId, teamId, newTeamRoleList, serviceClassName, oldTeamRoleList);
// 修改权限信息
updatePermission(entity.getTeamObjectPermissionList(), oldTeam.getTeamObjectPermissionList(), teamId, serviceClassName, userId);
@ -91,7 +95,9 @@ public class AbstractTeamServiceImpl<D extends SkyeyeBaseMapper<T>, T extends Ab
List<TeamRole> addTeamRoleMaps = newTeamRoleList.stream()
.filter(item -> !oldRoleKeys.contains(item.getRoleId())).collect(Collectors.toList());
// 新增
saveNewTeamRole(teamId, addTeamRoleMaps, serviceClassName, userId);
if (CollectionUtil.isNotEmpty(addTeamRoleMaps)) {
saveRole(userId, teamId, addTeamRoleMaps, serviceClassName);
}
// (旧数据 - 新数据) 从数据库删除
List<TeamRole> deleteTeamRole = oldTeamRoleList.stream()
.filter(item -> !newRoleKeys.contains(item.getRoleId())).collect(Collectors.toList());
@ -102,20 +108,16 @@ public class AbstractTeamServiceImpl<D extends SkyeyeBaseMapper<T>, T extends Ab
}
}
private void updateRoleUser(String userId, String teamId, List<TeamRole> newTeamRoleList, String serviceClassName, List<String> oldRoleKeys) {
// 新数据和旧数据交集(团队角色)需要编辑的数据
List<TeamRole> oldTeamRole = newTeamRoleList.stream()
.filter(item -> oldRoleKeys.contains(item.getRoleId())).collect(Collectors.toList());
private void updateRoleUser(String userId, String teamId, List<TeamRole> newTeamRoleList, String serviceClassName, List<TeamRole> oldTeamRole) {
// 新数据 - 旧数据 更新到数据库
List<TeamRoleUser> newRoleUser = getTeamRoleUserList(oldTeamRole);
List<String> newRoleUserKeys = newRoleUser.stream().map(bean -> bean.getTeamId() + bean.getUserId()).collect(Collectors.toList());
List<TeamRoleUser> newRoleUser = getTeamRoleUserList(newTeamRoleList);
List<String> newRoleUserKeys = newRoleUser.stream().map(bean -> teamId + bean.getUserId()).collect(Collectors.toList());
// 数据库里面的该团队模板下的用户信息
List<TeamRoleUser> oldRoleUser = getTeamRoleUserList(oldTeamRole);
List<String> oldRoleUserKeys = oldRoleUser.stream().map(bean -> bean.getTeamId() + bean.getUserId()).collect(Collectors.toList());
List<String> oldRoleUserKeys = oldRoleUser.stream().map(bean -> teamId + bean.getUserId()).collect(Collectors.toList());
// 需要新增的用户信息
List<TeamRoleUser> addTeamRoleUser = newRoleUser.stream()
.filter(item -> !oldRoleUserKeys.contains(item.getTeamId() + item.getUserId())).collect(Collectors.toList());
.filter(item -> !oldRoleUserKeys.contains(teamId + item.getUserId())).collect(Collectors.toList());
addTeamRoleUser.forEach(p -> {
p.setId(null);
p.setTeamId(teamId);
@ -126,7 +128,7 @@ public class AbstractTeamServiceImpl<D extends SkyeyeBaseMapper<T>, T extends Ab
}
// 删除用户关联信息
List<TeamRoleUser> deleteRoleUser = oldRoleUser.stream()
.filter(predicate -> !newRoleUserKeys.contains(predicate.getTeamId() + predicate.getUserId())).collect(Collectors.toList());
.filter(predicate -> !newRoleUserKeys.contains(teamId + predicate.getUserId())).collect(Collectors.toList());
if (CollectionUtil.isNotEmpty(deleteRoleUser)) {
List<String> deleteRoleUserLinkIds = deleteRoleUser.stream().map(TeamRoleUser::getId).collect(Collectors.toList());
teamRoleUserService.deleteById(deleteRoleUserLinkIds);
@ -171,13 +173,6 @@ public class AbstractTeamServiceImpl<D extends SkyeyeBaseMapper<T>, T extends Ab
.filter(Objects::nonNull).collect(Collectors.toList());
}
public void saveNewTeamRole(String teamId, List<TeamRole> teamRoleList, String serviceClassName, String userId) {
if (CollectionUtil.isNotEmpty(teamRoleList)) {
saveRole(userId, teamId, teamRoleList, serviceClassName);
saveRoleUser(userId, teamId, teamRoleList, serviceClassName);
}
}
public void saveTeamOwnerPermission(String teamId, String serviceClassName, String userId, List<TeamObjectPermission> addPermission) {
addPermission.forEach(bean -> {
bean.setTeamId(teamId);
@ -195,27 +190,11 @@ public class AbstractTeamServiceImpl<D extends SkyeyeBaseMapper<T>, T extends Ab
teamRoleService.createEntity(teamRoleList, userId);
}
private void saveRoleUser(String userId, String teamId, List<TeamRole> teamRoleList, String serviceClassName) {
List<TeamRoleUser> teamRoleUserList = teamRoleList.stream()
.filter(teamRole -> CollectionUtil.isNotEmpty(teamRole.getTeamRoleUserList()))
.flatMap(teamRole -> {
teamRole.getTeamRoleUserList().forEach(teamRoleUser -> {
teamRoleUser.setRoleId(teamRole.getRoleId());
teamRoleUser.setTeamId(teamId);
teamRoleUser.setTeamKey(serviceClassName);
});
return teamRole.getTeamRoleUserList().stream();
}).collect(Collectors.toList());
if (CollectionUtil.isNotEmpty(teamRoleUserList)) {
teamRoleUserService.createEntity(teamRoleUserList, userId);
}
}
@Override
public T getDataFromDb(String id) {
T team = super.getDataFromDb(id);
Map<String, List<TeamRole>> teamRoleMap = teamRoleService.queryTeamRoleByTeamIds(id);
team.setTeamRoleList(teamRoleMap.get(id));
Map<String, List<TeamRole>> teamRoleMap = teamRoleService.queryTeamRoleByTeamIds(team.getId());
team.setTeamRoleList(teamRoleMap.get(team.getId()));
List<TeamObjectPermission> teamObjectPermissionList = new ArrayList<>();
if (CollectionUtil.isNotEmpty(team.getTeamRoleList())) {
// 查询角色权限
@ -229,7 +208,7 @@ public class AbstractTeamServiceImpl<D extends SkyeyeBaseMapper<T>, T extends Ab
if (CollectionUtil.isNotEmpty(userIds)) {
ownerIds.addAll(userIds);
}
List<TeamObjectPermission> authermissionList = teamObjectPermissionService.queryPermissionByTeamId(id, ownerIds);
List<TeamObjectPermission> authermissionList = teamObjectPermissionService.queryPermissionByTeamId(team.getId(), ownerIds);
teamObjectPermissionList.addAll(authermissionList);
}
team.setTeamObjectPermissionList(teamObjectPermissionList);

8
skyeye-promote/skyeye-base-server/src/main/java/com/skyeye/team/service/impl/TeamBusinessServiceImpl.java
View file

@ -20,6 +20,7 @@ import com.skyeye.team.service.TeamBusinessService;
import com.skyeye.team.service.TeamTemplateService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
import java.util.Map;
@ -52,6 +53,7 @@ public class TeamBusinessServiceImpl extends AbstractTeamServiceImpl<TeamBusines
* @param outputObject 出参以及提示信息的返回值对象
*/
@Override
@Transactional(value = TRANSACTION_MANAGER_VALUE, rollbackFor = Exception.class)
public void createTeamBusiness(InputObject inputObject, OutputObject outputObject) {
Map<String, Object> params = inputObject.getParams();
String teamTemplateId = params.get("teamTemplateId").toString();
@ -101,6 +103,7 @@ public class TeamBusinessServiceImpl extends AbstractTeamServiceImpl<TeamBusines
* @param outputObject 出参以及提示信息的返回值对象
*/
@Override
@Transactional(value = TRANSACTION_MANAGER_VALUE, rollbackFor = Exception.class)
public void deleteTeamBusiness(InputObject inputObject, OutputObject outputObject) {
Map<String, Object> params = inputObject.getParams();
String objectId = params.get("objectId").toString();
@ -117,6 +120,7 @@ public class TeamBusinessServiceImpl extends AbstractTeamServiceImpl<TeamBusines
* @param outputObject 出参以及提示信息的返回值对象
*/
@Override
@Transactional(value = TRANSACTION_MANAGER_VALUE, rollbackFor = Exception.class)
public void checkTeamBusinessAuthPermission(InputObject inputObject, OutputObject outputObject) {
Map<String, Object> params = inputObject.getParams();
String objectId = params.get("objectId").toString();
@ -126,7 +130,9 @@ public class TeamBusinessServiceImpl extends AbstractTeamServiceImpl<TeamBusines
List<String> enumDataId = enumDataList.stream().map(bean -> bean.get(CommonConstants.ID).toString()).collect(Collectors.toList());
String userId = inputObject.getLogParams().get(CommonConstants.ID).toString();
iTeamBusinessService.checkAuthPermission(objectId, enumClassName, enumDataId, userId);
Map<String, Boolean> checkAuthPermission = iTeamBusinessService.checkAuthPermission(objectId, enumClassName, enumDataId, userId);
outputObject.setBean(checkAuthPermission);
outputObject.settotal(CommonNumConstants.NUM_ONE);
}
}

2
skyeye-promote/skyeye-base-server/src/main/java/com/skyeye/team/service/impl/TeamTemplateServiceImpl.java
View file

@ -64,7 +64,7 @@ public class TeamTemplateServiceImpl extends AbstractTeamServiceImpl<TeamTemplat
@Override
public void setUsed(String id) {
TeamTemplate teamTemplate = super.selectById(id);
if (teamTemplate.getIsUsed() == 0) {
if (teamTemplate.getIsUsed() == null || teamTemplate.getIsUsed() == 0) {
UpdateWrapper<TeamTemplate> updateWrapper = new UpdateWrapper<>();
updateWrapper.eq(CommonConstants.ID, id);
TeamTemplate template = new TeamTemplate();