|
|
@@ -40,7 +40,6 @@ import javax.persistence.criteria.CriteriaBuilder;
|
|
|
import javax.persistence.criteria.CriteriaQuery;
|
|
|
import javax.persistence.criteria.Root;
|
|
|
import java.util.ArrayList;
|
|
|
-import java.util.Arrays;
|
|
|
import java.util.Date;
|
|
|
import java.util.HashSet;
|
|
|
import java.util.Iterator;
|
|
|
@@ -477,7 +476,7 @@ public class VendorsServiceImpl implements VendorService {
|
|
|
*/
|
|
|
@Override
|
|
|
public void setSaleContacts(List<Vendor> vendorList, List<Long> idList) {
|
|
|
- List<VendorDistribute> distributeList = vendorDistributeDao.findByVendorId(idList);
|
|
|
+ List<VendorDistribute> distributeList = vendorDistributeDao.findByVendorIdList(idList);
|
|
|
List<VendorDistribute> distributeListCopy = new ArrayList<>();
|
|
|
distributeListCopy.addAll(distributeList);
|
|
|
if (!CollectionUtil.isEmpty(vendorList)) {
|
|
|
@@ -604,7 +603,7 @@ public class VendorsServiceImpl implements VendorService {
|
|
|
*/
|
|
|
@Override
|
|
|
public List<User> findUserInfoVendDistribute(Long veId) {
|
|
|
- List<VendorDistribute> distributes = vendorDistributeDao.findByVendorId(Arrays.asList(veId));
|
|
|
+ List<VendorDistribute> distributes = vendorDistributeDao.findByVendorId(veId);
|
|
|
List<User> users = userService.findUsersByEnUU(SystemSession.getUser().getEnterprise().getUu());
|
|
|
users.forEach(user -> {
|
|
|
distributes.forEach(distribute -> {
|