toolchaintechnologycenter/spdm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
zhuxinru
2026-01-08 19:57:42 +08:00
parent 32e66eedbf
commit 3b05077689
3 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
project/src/main/java/com/sdm/project/model/vo/SpdmTaskDetailVo.java
View File

@@ -151,8 +151,15 @@ public class SpdmTaskDetailVo extends BaseEntity {
private String englishName;
private String description;
private String projectName;
private String phaseName;
private String tag1;
private String tag2;
private String tag3;
private String tag4;
private String tag5;
private String tag6;
private String tag7;
private String tag8;
private String tag9;
private String tag10;
}

6
project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java
View File

@@ -1949,13 +1949,15 @@ public class TaskServiceImpl implements ITaskService {
return SdmResponse.success(jsonObject);
}
taskVoList.forEach(task -> {
SpdmNodeVo phaseNode = nodeMapper.getNodeById(task.getTag2());
SpdmNodeVo phaseNode = nodeMapper.getNodeById(task.getNewTag2());
if (phaseNode != null) {
task.setPhaseName(phaseNode.getNodeName());
task.setTag2(phaseNode.getNodeName());
}
SpdmNodeVo projectNode = nodeMapper.getNodeById(task.getTag1());
SpdmNodeVo projectNode = nodeMapper.getNodeById(task.getNewTag1());
if (projectNode != null) {
task.setProjectName(projectNode.getNodeName());
task.setTag1(projectNode.getNodeName());
}
});
List<String> taskIdList = taskVoList.stream().map(SpdmNewTaskVo::getUuid).toList();

7
system/src/main/java/com/sdm/system/service/impl/CID/CIDISysUserServiceImpl.java
View File

@@ -4,6 +4,7 @@ import cn.hutool.http.HttpUtil;
import cn.hutool.json.JSONUtil;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
import com.alibaba.fastjson2.TypeReference;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.sdm.common.common.SdmResponse;
import com.sdm.common.common.ThreadLocalContext;
@@ -180,7 +181,11 @@ public class CIDISysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser>
log.info("正在向CID用户角色API发送请求: {}，参数: {}", cidUrl + queryUserRole, paramMap);
String resultJson = HttpUtil.get(cidUrl + queryUserRole, paramMap);
log.info("收到CID用户角色API的响应: {}", resultJson);
SdmResponse<List<CIDRoleResp>> result = JSON.parseObject(resultJson, SdmResponse.class);
// SdmResponse<List<CIDRoleResp>> result = JSON.parseObject(resultJson, SdmResponse.class);
SdmResponse<List<CIDRoleResp>> result = JSON.parseObject(
resultJson,
new TypeReference<SdmResponse<List<CIDRoleResp>>>() {}
);
return result;
} catch (Exception e) {
log.error("查询用户角色失败", e);