|
@@ -23,6 +23,7 @@ import org.springframework.stereotype.Service;
|
|
|
import java.util.ArrayList;
|
|
import java.util.ArrayList;
|
|
|
import java.util.Date;
|
|
import java.util.Date;
|
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
|
|
+import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
* @version
|
|
* @version
|
|
@@ -74,16 +75,21 @@ public class SysUserLinkPtlAgreementServiceImpl extends ServiceImpl<SysUserLinkP
|
|
|
String userId = sysUserLinkPtlAgreementAddVo.getUserId();
|
|
String userId = sysUserLinkPtlAgreementAddVo.getUserId();
|
|
|
List<Long> ptlAgreementIds = sysUserLinkPtlAgreementAddVo.getPtlAgreementIds();
|
|
List<Long> ptlAgreementIds = sysUserLinkPtlAgreementAddVo.getPtlAgreementIds();
|
|
|
//删除数据重新添加
|
|
//删除数据重新添加
|
|
|
- sysUserLinkPtlAgreementMapper.deleteByUserId(userId);
|
|
|
|
|
|
|
+ //sysUserLinkPtlAgreementMapper.deleteByUserId(userId);
|
|
|
List<SysUserLinkPtlAgreement> addList=new ArrayList<SysUserLinkPtlAgreement>();
|
|
List<SysUserLinkPtlAgreement> addList=new ArrayList<SysUserLinkPtlAgreement>();
|
|
|
|
|
+
|
|
|
|
|
+ List<Long> ids=sysUserLinkPtlAgreementMapper.findAgreeIdsByUserId(userId);
|
|
|
|
|
+ List<Long> differences = ptlAgreementIds.stream()
|
|
|
|
|
+ .filter(i -> !ids.contains(i))
|
|
|
|
|
+ .collect(Collectors.toList());
|
|
|
//重新添加
|
|
//重新添加
|
|
|
- if(ptlAgreementIds!=null && ptlAgreementIds.size()>0){
|
|
|
|
|
- for (Long ptlAgreementId : ptlAgreementIds) {
|
|
|
|
|
|
|
+ if(differences!=null && differences.size()>0){
|
|
|
|
|
+ for (Long ptlAgreementId : differences) {
|
|
|
SysUserLinkPtlAgreement add=new SysUserLinkPtlAgreement(userId,ptlAgreementId,user.getId(),user.getName(),new Date(),user.getId(),user.getName(),new Date());
|
|
SysUserLinkPtlAgreement add=new SysUserLinkPtlAgreement(userId,ptlAgreementId,user.getId(),user.getName(),new Date(),user.getId(),user.getName(),new Date());
|
|
|
addList.add(add);
|
|
addList.add(add);
|
|
|
}
|
|
}
|
|
|
|
|
+ this.saveBatch(addList);
|
|
|
}
|
|
}
|
|
|
- this.saveBatch(addList);
|
|
|
|
|
}
|
|
}
|
|
|
/**
|
|
/**
|
|
|
* @version
|
|
* @version
|