diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java index 78034ca6..2495d487 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java @@ -49,6 +49,8 @@ import com.jero.modules.activiti.process.projectassess.entity.ProcessProjectAsse import com.jero.modules.activiti.process.projectassess.mapper.ProcessProjectAssessMapper; import org.springframework.transaction.annotation.Transactional; +import static org.apache.tools.ant.taskdefs.SetPermissions.NonPosixMode.pass; + /** * @author liJiaRao * @date 2023-12-05 15:57 @@ -528,6 +530,10 @@ public class ProcessProjectAssessService extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); wrapper.eq(ProcessApprovalRecord::getProcessInstanceId,processInstanceId); - wrapper.eq(ProcessApprovalRecord::getUserId, CurrentUserUtil.getId()); + wrapper.eq(StringUtils.isBlank(userId),ProcessApprovalRecord::getUserId, CurrentUserUtil.getId()); + wrapper.eq(!StringUtils.isBlank(userId),ProcessApprovalRecord::getUserId, userId); wrapper.eq(ProcessApprovalRecord::getFinishFlag,FinishFlagEnum.COMPLETE.getValue()); wrapper.eq(StringUtils.isNotBlank(nodeId), ProcessApprovalRecord::getNodeId,nodeId); wrapper.orderByDesc(ProcessApprovalRecord::getEndTime);