wangliwen
/
share-platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
yitonglei 2022-07-01 18:21:01 +08:00
parent f367009215 8d15ad35de
commit 4f2ba4d710
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
renren-admin/src/main/java/io/renren/modules/activiti/service/ActHistoryService.java
View File

@ -4,6 +4,8 @@ import io.renren.common.constant.Constant;
import io.renren.common.page.PageData; import io.renren.common.page.PageData;
import io.renren.modules.activiti.dto.ProcessInstanceDTO; import io.renren.modules.activiti.dto.ProcessInstanceDTO;
import io.renren.modules.activiti.dto.TaskDTO; import io.renren.modules.activiti.dto.TaskDTO;
import io.renren.modules.demandComment.dto.TDemandCommentDTO;
import io.renren.modules.demandComment.service.TDemandCommentService;
import io.renren.modules.processForm.dto.TAbilityApplicationDTO; import io.renren.modules.processForm.dto.TAbilityApplicationDTO;
import io.renren.modules.processForm.service.TAbilityApplicationService; import io.renren.modules.processForm.service.TAbilityApplicationService;
import io.renren.modules.resource.dto.ResourceDTO; import io.renren.modules.resource.dto.ResourceDTO;
@ -78,6 +80,9 @@ public class ActHistoryService {
@Autowired @Autowired
private TAbilityApplicationService tAbilityApplicationService; private TAbilityApplicationService tAbilityApplicationService;
@Autowired
private TDemandCommentService tDemandCommentService;
@Autowired @Autowired
private ProcessEngine processEngine_; private ProcessEngine processEngine_;
@ -302,6 +307,12 @@ public class ActHistoryService {
if (resourceDTO != null) { if (resourceDTO != null) {
dto.setName(resourceDTO.getName()); dto.setName(resourceDTO.getName());
dto.setResourceId(resourceDTO.getId().toString()); dto.setResourceId(resourceDTO.getId().toString());
} else {
TDemandCommentDTO tDemandCommentDTO = tDemandCommentService.get(Long.valueOf(dto.getBusinessKey()));
if (tDemandCommentDTO != null) {
dto.setName("发表需求评论");
dto.setResourceId(tDemandCommentDTO.getId().toString());
}
} }
} }
} }