Index: forgon-tools/src/main/java/com/forgon/system/concurrent/model/OptimisticLockConflictException.java =================================================================== diff -u -r23838 -r25613 --- forgon-tools/src/main/java/com/forgon/system/concurrent/model/OptimisticLockConflictException.java (.../OptimisticLockConflictException.java) (revision 23838) +++ forgon-tools/src/main/java/com/forgon/system/concurrent/model/OptimisticLockConflictException.java (.../OptimisticLockConflictException.java) (revision 25613) @@ -11,8 +11,8 @@ */ public class OptimisticLockConflictException extends OptimisticLockException { public OptimisticLockConflictException(String id, - TransactionInfo transactionInfo) { - super(String.format("id为%s的记录已被事务%s锁定,请稍后重试!", id, - transactionInfo.getName())); + TransactionInfo transactionInfo,OptimisticLock existingOptimisticLock) { + super(String.format("系统检测到同时操作冲突,请稍后再试!信息如下:id为%s的记录已被事务%s锁定,所在表:%s", id, + transactionInfo.getName(),existingOptimisticLock.getEntity())); } } Index: forgon-tools/src/main/java/com/forgon/system/concurrent/model/EntityLocksInfo.java =================================================================== diff -u -r25255 -r25613 --- forgon-tools/src/main/java/com/forgon/system/concurrent/model/EntityLocksInfo.java (.../EntityLocksInfo.java) (revision 25255) +++ forgon-tools/src/main/java/com/forgon/system/concurrent/model/EntityLocksInfo.java (.../EntityLocksInfo.java) (revision 25613) @@ -59,7 +59,7 @@ } if (existingOptimisticLock != null) { if (existingOptimisticLock.getTransactionInfo() != transactionInfo) { - throw new OptimisticLockConflictException(id, transactionInfo); + throw new OptimisticLockConflictException(id, transactionInfo,existingOptimisticLock); } } Index: forgon-tools/src/main/java/com/forgon/system/concurrent/model/RowLocksInfo.java =================================================================== diff -u -r25255 -r25613 --- forgon-tools/src/main/java/com/forgon/system/concurrent/model/RowLocksInfo.java (.../RowLocksInfo.java) (revision 25255) +++ forgon-tools/src/main/java/com/forgon/system/concurrent/model/RowLocksInfo.java (.../RowLocksInfo.java) (revision 25613) @@ -39,7 +39,7 @@ if (existingOptimisticLock != null) { if (existingOptimisticLock.getTransactionInfo() != transactionInfo) { throw new OptimisticLockConflictException(colId, - transactionInfo); + transactionInfo,existingOptimisticLock); } }