Merge remote-tracking branch 'origin/main'

This commit is contained in:
2026-02-04 10:34:10 +08:00

View File

@@ -1333,14 +1333,17 @@ public class TaskServiceImpl implements ITaskService {
} }
// 设置任务执行人对关联的需求文件夹设置权限 // 设置任务执行人对关联的需求文件夹设置权限
if (StringUtils.isNotEmpty(task.getDemandId())) { if (StringUtils.isNotEmpty(task.getDemandId())) {
SpdmDemandVo demand = demandMapper.getDemandListById(Collections.singletonList(task.getDemandId())).get(0); List<SpdmDemandVo> demandVoList = demandMapper.getDemandListById(Collections.singletonList(task.getDemandId()));
for (Long currentUserId : currentUserIdList) { if (CollectionUtils.isNotEmpty(demandVoList)) {
BatchUpdatePermissionReq.FilePermissionItem item = new BatchUpdatePermissionReq.FilePermissionItem(); SpdmDemandVo demand = demandVoList.get(0);
item.setUuid(demand.getUuid()); for (Long currentUserId : currentUserIdList) {
Map<Long, Byte> userPermissions = new HashMap<>(); BatchUpdatePermissionReq.FilePermissionItem item = new BatchUpdatePermissionReq.FilePermissionItem();
userPermissions.put(currentUserId, FilePermissionEnum.BASE.getValue()); item.setUuid(demand.getUuid());
item.setUserPermissions(userPermissions); Map<Long, Byte> userPermissions = new HashMap<>();
filePermissions.add(item); userPermissions.put(currentUserId, FilePermissionEnum.BASE.getValue());
item.setUserPermissions(userPermissions);
filePermissions.add(item);
}
} }
} }
batchUpdatePermission(filePermissions); batchUpdatePermission(filePermissions);
@@ -3786,14 +3789,17 @@ public class TaskServiceImpl implements ITaskService {
} }
// 设置任务执行人对关联的需求文件夹设置权限 // 设置任务执行人对关联的需求文件夹设置权限
if (StringUtils.isNotEmpty(task.getDemandId())) { if (StringUtils.isNotEmpty(task.getDemandId())) {
SpdmDemandVo demand = demandMapper.getDemandListById(Collections.singletonList(task.getDemandId())).get(0); List<SpdmDemandVo> demandVoList = demandMapper.getDemandListById(Collections.singletonList(task.getDemandId()));
for (Long currentUserId : currentUserIdList) { if (CollectionUtils.isNotEmpty(demandVoList)) {
BatchUpdatePermissionReq.FilePermissionItem item = new BatchUpdatePermissionReq.FilePermissionItem(); SpdmDemandVo demand = demandVoList.get(0);
item.setUuid(demand.getUuid()); for (Long currentUserId : currentUserIdList) {
Map<Long, Byte> userPermissions = new HashMap<>(); BatchUpdatePermissionReq.FilePermissionItem item = new BatchUpdatePermissionReq.FilePermissionItem();
userPermissions.put(currentUserId, FilePermissionEnum.BASE.getValue()); item.setUuid(demand.getUuid());
item.setUserPermissions(userPermissions); Map<Long, Byte> userPermissions = new HashMap<>();
filePermissions.add(item); userPermissions.put(currentUserId, FilePermissionEnum.BASE.getValue());
item.setUserPermissions(userPermissions);
filePermissions.add(item);
}
} }
} }
batchUpdatePermission(filePermissions); batchUpdatePermission(filePermissions);