|
|
|
@ -25,6 +25,7 @@ import com.baiye.modules.system.repository.UserRepository;
|
|
|
|
|
import com.baiye.modules.system.service.RoleService;
|
|
|
|
|
import com.baiye.modules.system.service.UserService;
|
|
|
|
|
import com.baiye.modules.telemarkting.dao.ExtensionUserRepository;
|
|
|
|
|
import com.baiye.modules.telemarkting.entity.ExtensionNumber;
|
|
|
|
|
import com.baiye.modules.telemarkting.service.ExtensionNumberService;
|
|
|
|
|
import com.baiye.util.*;
|
|
|
|
|
import com.google.common.collect.Lists;
|
|
|
|
@ -169,7 +170,7 @@ public class OrganizeServiceImpl implements OrganizeService {
|
|
|
|
|
sourceClueClient.updateOrganize(organizeId, replaceOrganizeId);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
/**
|
|
|
|
|
* 添加组员
|
|
|
|
|
*/
|
|
|
|
|
@Override
|
|
|
|
@ -604,7 +605,9 @@ public class OrganizeServiceImpl implements OrganizeService {
|
|
|
|
|
Organize organize = organizeRepository.findById(organizeUser.getOrganizeId()).orElseGet(Organize::new);
|
|
|
|
|
if (organize.getCallMode() == 1) {
|
|
|
|
|
// (点呼)获取分机号
|
|
|
|
|
tel = String.valueOf(extensionNumberService.getExtension(userId).getNumber());
|
|
|
|
|
ExtensionNumber extension = extensionNumberService.getExtension(userId);
|
|
|
|
|
tel = String.valueOf(extension.getNumber());
|
|
|
|
|
callModeMap.put("sip", extension.getSip());
|
|
|
|
|
} else if (organize.getCallMode() == 2) {
|
|
|
|
|
Company company = companyRepository.findById(user.getCompanyId()).orElseGet(Company::new);
|
|
|
|
|
tel = company.getTelX();
|
|
|
|
@ -790,7 +793,7 @@ public class OrganizeServiceImpl implements OrganizeService {
|
|
|
|
|
List<OrganizeUser> list = organizeUserRepository.findByOrganizeId(organizeId);
|
|
|
|
|
Long leaderUserId = null;
|
|
|
|
|
for (OrganizeUser organizeUser : list) {
|
|
|
|
|
if (organizeUser.getIsLeader()){
|
|
|
|
|
if (organizeUser.getIsLeader()) {
|
|
|
|
|
organizeUser.setIsLeader(false);
|
|
|
|
|
leaderUserId = organizeUser.getUserId();
|
|
|
|
|
}
|
|
|
|
|