Просмотр исходного кода

Merge branch 'test3' into test2

anderx 1 год назад
Родитель
Сommit
c3c14ca9cd
1 измененных файлов с 1 добавлено и 1 удалено
  1. 1 1
      src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java

+ 1 - 1
src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java

@@ -338,7 +338,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 			ulr.setLockTime(date);
 			ulr.setLockTime(date);
 			userLockReleaseMapper.insertSelective(ulr);
 			userLockReleaseMapper.insertSelective(ulr);
 		}
 		}
-		int i = userBusinessMapper.judgeBusiness(tn.getBuyerId(), t.getCommodityId(), TokenManager.getAdminId());
+		int i = userBusinessMapper.judgeBusiness(tn.getBuyerId(), t.getCommodityId(), tn.getSalesmanId());
 		UserBusiness ub=new UserBusiness();
 		UserBusiness ub=new UserBusiness();
 		ub.setId(UUID.randomUUID().toString());
 		ub.setId(UUID.randomUUID().toString());
 		ub.setUid(tn.getBuyerId());
 		ub.setUid(tn.getBuyerId());