Commit e7a42aff authored by 陈家荣's avatar 陈家荣

update

parent 56de2d07
...@@ -354,8 +354,11 @@ public class KolonMemberServiceImpl implements KolonMemberService { ...@@ -354,8 +354,11 @@ public class KolonMemberServiceImpl implements KolonMemberService {
List<String[]> addData = getDataList(); List<String[]> addData = getDataList();
List<String[]> updateData = getDataList(); List<String[]> updateData = getDataList();
for(KolonMember km : kolonMembers){ for(KolonMember km : kolonMembers){
//查询Member, //查询Member
Member member = memberService.findById(km.mid); Member member = null;
if(Util.isNotNull(km.mid)){
member = memberService.findById(km.mid);
}
if(km.dataSource == 2){ if(km.dataSource == 2){
updateData.add(convertDataUpdate(km, member, null)); updateData.add(convertDataUpdate(km, member, null));
}else if(km.dataSource == 1 && km.joinTime.after(lastSendDate)){ //加入时间在发送时间之后,数据是新增的 }else if(km.dataSource == 1 && km.joinTime.after(lastSendDate)){ //加入时间在发送时间之后,数据是新增的
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment