Merge remote-tracking branch 'remotes/origin/dev_1.0.0' into release_1.0.0

src/main/java/cn/com/qmth/mps/service/impl/PaperServiceImpl.java

@@ -140,6 +140,7 @@ public class PaperServiceImpl extends ServiceImpl<PaperDao, PaperEntity> impleme
 
 			}
 			if (CollectionUtils.isNotEmpty(failRecords)) {
+				TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
 				return failRecords;
 			}
 			for (int i = 0; i < ret.size(); i++) {
@@ -458,9 +459,11 @@ public class PaperServiceImpl extends ServiceImpl<PaperDao, PaperEntity> impleme
 				}
 
 			}
-			if (CollectionUtils.isEmpty(failRecords)) {
-				this.saveStruct(ret, user, failRecords);
+			if (CollectionUtils.isNotEmpty(failRecords)) {
+				TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+				return failRecords;
 			}
+			this.saveStruct(ret, user, failRecords);
 			if (CollectionUtils.isNotEmpty(failRecords)) {
 				TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
 			}

src/main/java/cn/com/qmth/mps/service/impl/UserServiceImpl.java

@@ -210,6 +210,7 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
 
 			}
 			if (CollectionUtils.isNotEmpty(failRecords)) {
+				TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
 				return failRecords;
 			}
 			for (int i = 0; i < userList.size(); i++) {