|
|
@ -59,7 +59,6 @@ public class OrganizeServiceImpl implements OrganizeService {
|
|
|
|
private final UserMessageService userMessageService;
|
|
|
|
private final UserMessageService userMessageService;
|
|
|
|
private final ExtensionNumberService extensionNumberService;
|
|
|
|
private final ExtensionNumberService extensionNumberService;
|
|
|
|
private final CompanyRepository companyRepository;
|
|
|
|
private final CompanyRepository companyRepository;
|
|
|
|
private final ExtensionUserRepository extensionUserRepository;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* 新增小组
|
|
|
|
* 新增小组
|
|
|
@ -94,6 +93,14 @@ public class OrganizeServiceImpl implements OrganizeService {
|
|
|
|
@CacheEvict(value = "organize", key = "'organize:' + #organize.getId()")
|
|
|
|
@CacheEvict(value = "organize", key = "'organize:' + #organize.getId()")
|
|
|
|
public void updateOrganize(Organize organize) {
|
|
|
|
public void updateOrganize(Organize organize) {
|
|
|
|
Organize updateOrganize = organizeRepository.findById(organize.getId()).orElseGet(Organize::new);
|
|
|
|
Organize updateOrganize = organizeRepository.findById(organize.getId()).orElseGet(Organize::new);
|
|
|
|
|
|
|
|
OrganizeUser organizeUser = organizeUserRepository.findByOrganizeIdAndIsLeader(organize.getId(), true);
|
|
|
|
|
|
|
|
// 判断组长是否分配过资源
|
|
|
|
|
|
|
|
if (organizeUser.getUserId() != organize.getUserId()){
|
|
|
|
|
|
|
|
Boolean flag = sourceClueClient.judgeMember(organizeUser.getUserId()).getBody();
|
|
|
|
|
|
|
|
if (flag) {
|
|
|
|
|
|
|
|
throw new BadRequestException("组长用户中有分配资源,组长替换失败");
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
//添加(删除)分机号
|
|
|
|
//添加(删除)分机号
|
|
|
|
if (organize.getCallMode() != null && organize.getCallMode() != updateOrganize.getCallMode()){
|
|
|
|
if (organize.getCallMode() != null && organize.getCallMode() != updateOrganize.getCallMode()){
|
|
|
|
List<OrganizeUser> organizeList = organizeUserRepository.findByOrganizeId(organize.getId());
|
|
|
|
List<OrganizeUser> organizeList = organizeUserRepository.findByOrganizeId(organize.getId());
|
|
|
@ -563,6 +570,7 @@ public class OrganizeServiceImpl implements OrganizeService {
|
|
|
|
Long userId = SecurityUtils.getCurrentUserId();
|
|
|
|
Long userId = SecurityUtils.getCurrentUserId();
|
|
|
|
User user = userRepository.findById(userId).orElseGet(User::new);
|
|
|
|
User user = userRepository.findById(userId).orElseGet(User::new);
|
|
|
|
OrganizeUser organizeUser = organizeUserRepository.findByUserId(userId);
|
|
|
|
OrganizeUser organizeUser = organizeUserRepository.findByUserId(userId);
|
|
|
|
|
|
|
|
if (organizeUser != null){
|
|
|
|
Organize organize = organizeRepository.findById(organizeUser.getOrganizeId()).orElseGet(Organize::new);
|
|
|
|
Organize organize = organizeRepository.findById(organizeUser.getOrganizeId()).orElseGet(Organize::new);
|
|
|
|
if (organize.getCallMode() == 1){
|
|
|
|
if (organize.getCallMode() == 1){
|
|
|
|
// (点呼)获取分机号
|
|
|
|
// (点呼)获取分机号
|
|
|
@ -575,6 +583,8 @@ public class OrganizeServiceImpl implements OrganizeService {
|
|
|
|
callModeMap.put("callNum",tel);
|
|
|
|
callModeMap.put("callNum",tel);
|
|
|
|
return callModeMap;
|
|
|
|
return callModeMap;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return callModeMap;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* 小组id查询组员用户信息
|
|
|
|
* 小组id查询组员用户信息
|
|
|
|