Merge branch 'master_20240722' of http://git.dgtis.com/15896567520/oneportal_saas into master_20240722

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/entry/OaEntryServiceImpl.java

@@ -296,27 +296,27 @@ public class OaEntryServiceImpl implements OaEntryService {
         bpmTaskService.approveTask(loginEmployee.getId(), agreeReqVO);
 
         Task nextTask = taskService.createTaskQuery().processInstanceId(currentTask.getProcessInstanceId()).singleResult();
-        OaEntryDO oaEntryDO = new OaEntryDO();
+        LambdaUpdateWrapper<OaEntryDO> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
         if (nextTask != null) {
             // 如果审批人重复，实际未结束，再次更新为审核中
             taskService.setVariable(nextTask.getId(), BpmConstants.PROCESS_INSTANCE_VARIABLE_STATUS, DictDataConstants.OA_AUDIT_STATUS_AUDITING);
-            oaEntryDO.setAuditStatus(DictDataConstants.OA_AUDIT_STATUS_AUDITING)
-                    .setCurrentAuditEmployeeId(Long.valueOf(nextTask.getAssignee()))
-                    .setFinalAuditDate(LocalDateTime.now())
-                    .setId(oaEntry.getId());
+            lambdaUpdateWrapper.set(OaEntryDO::getAuditStatus, DictDataConstants.OA_AUDIT_STATUS_AUDITING)
+                    .set(OaEntryDO::getCurrentAuditEmployeeId, Long.valueOf(nextTask.getAssignee()))
+                    .set(OaEntryDO::getFinalAuditDate, LocalDateTime.now())
+                    .eq(OaEntryDO::getId, oaEntry.getId());
 
         } else {
-            oaEntryDO.setAuditStatus(DictDataConstants.OA_AUDIT_STATUS_AUDITED)
-                    .setCurrentAuditEmployeeId(null)
-                    .setFinalAuditDate(LocalDateTime.now())
-                    .setId(oaEntry.getId());
+            lambdaUpdateWrapper.set(OaEntryDO::getAuditStatus, DictDataConstants.OA_AUDIT_STATUS_AUDITED)
+                    .set(OaEntryDO::getCurrentAuditEmployeeId, null)
+                    .set(OaEntryDO::getFinalAuditDate, LocalDateTime.now())
+                    .eq(OaEntryDO::getId, oaEntry.getId());
 
         }
-        oaEntryMapper.updateById(oaEntryDO);
+        oaEntryMapper.update(lambdaUpdateWrapper);
         // 复制业务单据信息到业务模块单据表
         if(Objects.isNull(nextTask)) {
             // 查询申请单
-            OaEntryDO entry = oaEntryMapper.selectById(oaEntryDO.getId());
+            OaEntryDO entry = oaEntryMapper.selectById(oaEntry.getId());
 
             // 转换为DTO
             RelationsEntryCreateReqDTO entryCreateReqDTO = BeanUtils.toBean(entry, RelationsEntryCreateReqDTO.class);