lcj/xinnengyuan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

10-28-bug修复

Browse Source
This commit is contained in:
青云
2025-10-28 20:02:57 +08:00
parent abb6b8c13a
commit e6c58a64ac
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractDetailsServiceImpl.java
View File

@ -458,9 +458,11 @@ public class XzdContractDetailsServiceImpl extends ServiceImpl<XzdContractDetail
public void setValue(List<XzdContractDetailsVo> infos){ public void setValue(List<XzdContractDetailsVo> infos){
for (XzdContractDetailsVo info : infos) { for (XzdContractDetailsVo info : infos) {
//部门名称 //部门名称
SysDeptVo sysDeptVo = sysDeptService.selectDeptById(info.getDeptId()); if (info.getDeptId() != null) {
if (sysDeptVo != null){ SysDeptVo sysDeptVo = sysDeptService.selectDeptById(info.getDeptId());
info.setDeptName(sysDeptVo.getDeptName()); if (sysDeptVo != null) {
info.setDeptName(sysDeptVo.getDeptName());
}
} }
//项目名称 //项目名称
if (info.getProject() != null) { if (info.getProject() != null) {

6
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractTerminationServiceImpl.java
View File

@ -202,7 +202,7 @@ public class XzdContractTerminationServiceImpl extends ServiceImpl<XzdContractTe
* *
* @param processEvent 参数 * @param processEvent 参数
*/ */
@EventListener(condition = "#processEvent.flowCode.endsWith('XzdContractTermination')") @EventListener(condition = "#processEvent.flowCode.endsWith('XzdContractTermina')")
@Transactional @Transactional
public void processPlansHandler(ProcessEvent processEvent) { public void processPlansHandler(ProcessEvent processEvent) {
log.info("承包合同终止审核任务执行了{}", processEvent.toString()); log.info("承包合同终止审核任务执行了{}", processEvent.toString());
@ -226,7 +226,7 @@ public class XzdContractTerminationServiceImpl extends ServiceImpl<XzdContractTe
* *
* @param processTaskEvent 参数 * @param processTaskEvent 参数
*/ */
@org.springframework.context.event.EventListener(condition = "#processTaskEvent.flowCode.endsWith('XzdContractTermination')") @org.springframework.context.event.EventListener(condition = "#processTaskEvent.flowCode.endsWith('XzdContractTermina')")
public void processTaskPlansHandlerEquipmentList(ProcessTaskEvent processTaskEvent) { public void processTaskPlansHandlerEquipmentList(ProcessTaskEvent processTaskEvent) {
log.info("承包合同终止审核任务创建了{}", processTaskEvent.toString()); log.info("承包合同终止审核任务创建了{}", processTaskEvent.toString());
} }
@ -238,7 +238,7 @@ public class XzdContractTerminationServiceImpl extends ServiceImpl<XzdContractTe
* *
* @param processDeleteEvent 参数 * @param processDeleteEvent 参数
*/ */
@EventListener(condition = "#processDeleteEvent.flowCode.endsWith('XzdContractTermination')") @EventListener(condition = "#processDeleteEvent.flowCode.endsWith('XzdContractTermina')")
public void processDeletePlansHandlerEquipmentList(ProcessDeleteEvent processDeleteEvent) { public void processDeletePlansHandlerEquipmentList(ProcessDeleteEvent processDeleteEvent) {
log.info("承包合同终止计划删除流程事件{}", processDeleteEvent.toString()); log.info("承包合同终止计划删除流程事件{}", processDeleteEvent.toString());
} }