Merge remote-tracking branch 'origin/main'

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

View File

@@ -1333,7 +1333,9 @@ public class TaskServiceImpl implements ITaskService {
}
// 设置任务执行人对关联的需求文件夹设置权限
if (StringUtils.isNotEmpty(task.getDemandId())) {
SpdmDemandVo demand = demandMapper.getDemandListById(Collections.singletonList(task.getDemandId())).get(0);
List<SpdmDemandVo> demandVoList = demandMapper.getDemandListById(Collections.singletonList(task.getDemandId()));
if (CollectionUtils.isNotEmpty(demandVoList)) {
SpdmDemandVo demand = demandVoList.get(0);
for (Long currentUserId : currentUserIdList) {
BatchUpdatePermissionReq.FilePermissionItem item = new BatchUpdatePermissionReq.FilePermissionItem();
item.setUuid(demand.getUuid());
@@ -1343,6 +1345,7 @@ public class TaskServiceImpl implements ITaskService {
filePermissions.add(item);
}
}
}
batchUpdatePermission(filePermissions);
@@ -3786,7 +3789,9 @@ public class TaskServiceImpl implements ITaskService {
}
// 设置任务执行人对关联的需求文件夹设置权限
if (StringUtils.isNotEmpty(task.getDemandId())) {
SpdmDemandVo demand = demandMapper.getDemandListById(Collections.singletonList(task.getDemandId())).get(0);
List<SpdmDemandVo> demandVoList = demandMapper.getDemandListById(Collections.singletonList(task.getDemandId()));
if (CollectionUtils.isNotEmpty(demandVoList)) {
SpdmDemandVo demand = demandVoList.get(0);
for (Long currentUserId : currentUserIdList) {
BatchUpdatePermissionReq.FilePermissionItem item = new BatchUpdatePermissionReq.FilePermissionItem();
item.setUuid(demand.getUuid());
@@ -3796,6 +3801,7 @@ public class TaskServiceImpl implements ITaskService {
filePermissions.add(item);
}
}
}
batchUpdatePermission(filePermissions);
// 新增拓展属性