Commit 77df15c6 authored by 赵啸非's avatar 赵啸非

修改假期重复提交的问题

parent 91b441ba
...@@ -96,7 +96,7 @@ public class DingMessageController { ...@@ -96,7 +96,7 @@ public class DingMessageController {
*/ */
@PostMapping("/dingtalk/getOaMeassge") @PostMapping("/dingtalk/getOaMeassge")
@UnAuth @UnAuth
public Map<String, String> getOaMessage(@RequestParam(value = "msg_signature", required = false) String msg_signature, public synchronized Map<String, String> getOaMessage(@RequestParam(value = "msg_signature", required = false) String msg_signature,
@RequestParam(value = "timestamp", required = false) String timeStamp, @RequestParam(value = "timestamp", required = false) String timeStamp,
@RequestParam(value = "nonce", required = false) String nonce, @RequestParam(value = "nonce", required = false) String nonce,
@RequestBody(required = false) JSONObject json) { @RequestBody(required = false) JSONObject json) {
......
...@@ -49,20 +49,23 @@ public class AttendanceLeaveRecordServiceImpl extends AbstractCRUDServiceImpl<At ...@@ -49,20 +49,23 @@ public class AttendanceLeaveRecordServiceImpl extends AbstractCRUDServiceImpl<At
} }
@Override @Override
public synchronized AttendanceLeaveRecordEntity doUpdateRecord(String processInstanceId, AttendanceLeaveRecordEntity leaveRecordEntity) throws Exception { public AttendanceLeaveRecordEntity doUpdateRecord(String processInstanceId, AttendanceLeaveRecordEntity leaveRecordEntity) throws Exception {
AttendanceLeaveRecordEntity recordEntity = this.selectOne(new AttendanceLeaveRecordQuery().remark(processInstanceId)); synchronized (this) {
if (ObjectUtils.isEmpty(recordEntity)) { AttendanceLeaveRecordEntity recordEntity = this.selectOne(new AttendanceLeaveRecordQuery().remark(processInstanceId));
leaveRecordEntity.setCreateTime(new Date()); if (ObjectUtils.isEmpty(recordEntity)) {
leaveRecordEntity.setCreateUserId(1L); leaveRecordEntity.setCreateTime(new Date());
this.save(leaveRecordEntity); leaveRecordEntity.setCreateUserId(1L);
} else { this.save(leaveRecordEntity);
leaveRecordEntity.setId(recordEntity.getId()); } else {
leaveRecordEntity.setId(recordEntity.getId());
leaveRecordEntity.setUpdateUserId(1L); leaveRecordEntity.setUpdateUserId(1L);
leaveRecordEntity.setUpdateTime(new Date()); leaveRecordEntity.setUpdateTime(new Date());
this.update(leaveRecordEntity); this.update(leaveRecordEntity);
}
return leaveRecordEntity;
} }
return leaveRecordEntity;
} }
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment