From 022c492fe0645af7761889f6471e3e2ae5751fb6 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 26 五月 2020 15:27:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/money/TeamEincomeRecordServiceImpl.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/money/TeamEincomeRecordServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/money/TeamEincomeRecordServiceImpl.java
index 880dace..fccf51c 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/money/TeamEincomeRecordServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/money/TeamEincomeRecordServiceImpl.java
@@ -28,8 +28,8 @@
 				|| record.getPreRecieveTime() == null)
 			throw new ParamsException(1, "鍙傛暟涓嶅畬鏁�");
 
-		TeamEincomeRecord oldRecord = teamEincomeRecordMapper.selectByUidAndPreRecieveTimeAndType(record.getUid(),
-				record.getPreRecieveTime(), record.getType());
+		TeamEincomeRecord oldRecord = teamEincomeRecordMapper.selectByUidAndPreRecieveTimeAndTypeAndSourceType(record.getUid(),
+				record.getPreRecieveTime(), record.getType(),record.getSourceType());
 		if (oldRecord != null)
 			throw new TeamEincomeRecordException(1, "宸插瓨鍦�");
 		if (record.getCreateTime() == null)

--
Gitblit v1.8.0