|
@@ -113,12 +113,13 @@ public class ContractTemplateServiceImpl extends BaseServiceImpl<Integer, Contra
|
|
|
RLock lock = redissonClient.getLock(LOCK_NAME);
|
|
|
try {
|
|
|
if (lock.tryLock(10, 10, TimeUnit.SECONDS)) {
|
|
|
- ContractTemplate latestContractTemplate = contractTemplateDao.queryLatestContractTemplate(contractTemplate.getSource(), contractTemplate.getType());
|
|
|
- if(null == latestContractTemplate || null == latestContractTemplate.getVersion()){
|
|
|
+ Integer maxVersion = contractTemplateDao.queryMaxVersion(contractTemplate.getSource(), contractTemplate.getType());
|
|
|
+ if(null == maxVersion){
|
|
|
contractTemplate.setVersion(1);
|
|
|
}else{
|
|
|
- contractTemplate.setVersion(latestContractTemplate.getVersion() + 1);
|
|
|
+ contractTemplate.setVersion(maxVersion + 1);
|
|
|
}
|
|
|
+
|
|
|
Date date = new Date();
|
|
|
contractTemplate.setCreateTime(date);
|
|
|
contractTemplate.setUpdateTime(date);
|