diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectTraceController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectTraceController.java index 027ee1cf62..f7d44f5f94 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectTraceController.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectTraceController.java @@ -390,7 +390,7 @@ public class ProjectTraceController { * @Author zhaoqifeng * @Date 2022/1/4 15:32 */ - @PostMapping("approvaled-list") + @PostMapping("pcwork/approvaled-list") public Result> approvaledList(@LoginUser TokenDto tokenDto, @RequestBody ApprovaledListFromDTO formDTO) { ValidatorUtils.validateEntity(formDTO); formDTO.setCustomerId(tokenDto.getCustomerId()); diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java index 174f64a673..76aab37e9c 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java @@ -914,7 +914,7 @@ public class ProjectTraceServiceImpl implements ProjectTraceS CustomerStaffInfoCacheResult staff = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), item.getStaffId()); item.setStaffName(staff.getRealName()); //项目分类 - Set categoryList = projectCategory.get(item.getProjectCategory()); + Set categoryList = projectCategory.get(item.getProjectId()); if (null != categoryList) { List categoryNames = new ArrayList<>(); categoryList.forEach(category -> {