From 5c63d3fa13956182f999a02ebd291161cf1b32bc Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期五, 03 一月 2025 18:22:42 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/TrainTimeServiceImpl.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/TrainTimeServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/TrainTimeServiceImpl.java
index c44988f..f6f561e 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/TrainTimeServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/TrainTimeServiceImpl.java
@@ -13,7 +13,6 @@
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DESUtil;
import com.doumee.core.utils.DateUtil;
-import com.doumee.dao.admin.request.MemberImport;
import com.doumee.dao.admin.request.TrainTimeImport;
import com.doumee.dao.business.EmpowerMapper;
import com.doumee.dao.business.MemberRoleMapper;
@@ -193,7 +192,7 @@
//鏌ヨ鍏ㄩ儴鐩稿叧鏂逛汉鍛樹俊鎭�
List<Member> list = memberJoinMapper.selectJoinList(Member.class,new MPJLambdaWrapper<Member>()
.selectAll(Member.class)
- .leftJoin(Company.class,Company::getId,Member::getId)
+ .leftJoin(Company.class,Company::getId,Member::getCompanyId)
.eq(Company::getType,Constants.ZERO)
// .in(Company::getId,loginUserInfo.getCompanyIdList() )
.eq(Member::getIsdeleted, com.doumee.core.utils.Constants.ZERO));
@@ -231,7 +230,7 @@
if(newList == null || newList.size() ==0){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝褰曞叆鏈夋晥鏁版嵁涓虹┖锛�");
}
- trainTimeMapper.insertBatchSomeColumn(newList);
+ trainTimeMapper.insert(newList);
return "瀵煎叆鎴愬姛";
}catch (BusinessException e){
throw e;
--
Gitblit v1.9.3