Browse Source

Merge remote-tracking branch 'origin/test' into dev

anderx 7 years ago
parent
commit
74f4dd958c

+ 1 - 1
src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java

@@ -899,8 +899,8 @@ public class CustomerServiceImpl  extends BaseMybatisDao<UserMapper> implements
 			user.setInformationMaintainer(TokenManager.getAdminId());
 			user.setTransferTime(now);
 			flag = addUserLock(uid,TokenManager.getAdminId(),now); //指定用户锁定客户
-		}else if(operatorType.equals(AFTConstants.USER_TRANSFER_TO_OTHER)){
 			if(flag <= 0) throw new BusinessException(new Error(ErrorConstants.CUSTOMER_ALREADY_RECEIVE,""));
+		}else if(operatorType.equals(AFTConstants.USER_TRANSFER_TO_OTHER)){
 			user.setAid(String.valueOf(params[0]));
 			user.setTransferTime(now);
 			flag = updateUserLock(uid,oldAid,UserLockReleaseStatus.LOCKED.getCode(),UserLockReleaseStatus.RELEASE.getCode()); //原用户释放客户