|
@@ -16,6 +16,7 @@ import javax.annotation.Resource;
|
|
import java.util.ArrayList;
|
|
import java.util.ArrayList;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
import java.util.Map;
|
|
import java.util.Map;
|
|
|
|
+import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
/**
|
|
* @author huangyuan
|
|
* @author huangyuan
|
|
@@ -47,11 +48,10 @@ public class PropertyUserService implements IPropertyUserService {
|
|
IPage propertyUserPage = new Page(propertyUserRequest.getPageNum(), propertyUserRequest.getPageSize());
|
|
IPage propertyUserPage = new Page(propertyUserRequest.getPageNum(), propertyUserRequest.getPageSize());
|
|
if (projectUserList != null && projectUserList.size() > 0) {
|
|
if (projectUserList != null && projectUserList.size() > 0) {
|
|
//获取用户信息
|
|
//获取用户信息
|
|
- List<Long> userIdList = ProjectUtils.getAttrList(projectUserList, "userId", null);
|
|
|
|
|
|
+ List<Long> userIdList = projectUserList.stream().map(ProjectUser::getUserId).collect(Collectors.toList());
|
|
Map<Long, UserResponse> userIdToUserResponse = userService.getUserResponseByUserIdList(userIdList);
|
|
Map<Long, UserResponse> userIdToUserResponse = userService.getUserResponseByUserIdList(userIdList);
|
|
//获取项目信息
|
|
//获取项目信息
|
|
- List<Long> projectIdList = ProjectUtils.getAttrList(projectUserList,
|
|
|
|
- "projectId", null);
|
|
|
|
|
|
+ List<Long> projectIdList = projectUserList.stream().map(ProjectUser::getProjectId).collect(Collectors.toList());
|
|
Map<Long, ProjectInfo> projectIdToProjectInfo = projectService.getProjectIdToProjectByProjectIdList(projectIdList);
|
|
Map<Long, ProjectInfo> projectIdToProjectInfo = projectService.getProjectIdToProjectByProjectIdList(projectIdList);
|
|
List<PropertyUserResponse> propertyUserResponseList = new ArrayList<>();
|
|
List<PropertyUserResponse> propertyUserResponseList = new ArrayList<>();
|
|
for (ProjectUser projectUser : projectUserList) {
|
|
for (ProjectUser projectUser : projectUserList) {
|
|
@@ -84,7 +84,7 @@ public class PropertyUserService implements IPropertyUserService {
|
|
@Override
|
|
@Override
|
|
public RestResponse cancelPermission(PropertyUserRequest propertyUserRequest) {
|
|
public RestResponse cancelPermission(PropertyUserRequest propertyUserRequest) {
|
|
Long deleteCount = projectService.deleteProjectUser(propertyUserRequest);
|
|
Long deleteCount = projectService.deleteProjectUser(propertyUserRequest);
|
|
- if(deleteCount == 0){
|
|
|
|
|
|
+ if (deleteCount == 0) {
|
|
return RestResponse.fail(ApiConstants.RESULT_ERROR, "操作失败");
|
|
return RestResponse.fail(ApiConstants.RESULT_ERROR, "操作失败");
|
|
}
|
|
}
|
|
return RestResponse.success(ApiConstants.RESULT_SUCCESS, "操作成功");
|
|
return RestResponse.success(ApiConstants.RESULT_SUCCESS, "操作成功");
|