|
@@ -429,7 +429,7 @@ public class TBCrmServiceImpl extends ServiceImpl<TBCrmMapper, TBCrm> implements
|
|
|
String crmName = fxxkCrm.getCrmName();
|
|
|
Long beginTime = fxxkCrm.getBeginTime();
|
|
|
String managerName = fxxkCrm.getManagerName();
|
|
|
- String managerMobileNumber = fxxkCrm.getManagerMobileNumber();
|
|
|
+// String managerMobileNumber = fxxkCrm.getManagerMobileNumber();
|
|
|
ProductTypeEnum customType = fxxkCrm.getCustomType();
|
|
|
String customName = fxxkCrm.getCustomName();
|
|
|
Long examStartTime = fxxkCrm.getExamStartTime();
|
|
@@ -444,9 +444,9 @@ public class TBCrmServiceImpl extends ServiceImpl<TBCrmMapper, TBCrm> implements
|
|
|
if (managerName == null || managerName.length() == 0) {
|
|
|
basicInfoMissingError = basicInfoMissingError + "缺少客户经理";
|
|
|
}
|
|
|
- if (managerMobileNumber == null || managerMobileNumber.length() == 0) {
|
|
|
- basicInfoMissingError = basicInfoMissingError + "缺少客户经理电话";
|
|
|
- }
|
|
|
+// if (managerMobileNumber == null || managerMobileNumber.length() == 0) {
|
|
|
+// basicInfoMissingError = basicInfoMissingError + "缺少客户经理电话";
|
|
|
+// }
|
|
|
if (customType == null) {
|
|
|
basicInfoMissingError = basicInfoMissingError + "缺少客户类型或客户类型不为['高校教务处'或'研究生招办']";
|
|
|
}
|
|
@@ -469,17 +469,35 @@ public class TBCrmServiceImpl extends ServiceImpl<TBCrmMapper, TBCrm> implements
|
|
|
|
|
|
// 客户经理校验
|
|
|
Long crmUserId = null;
|
|
|
- SysUser sysUser = sysUserService.getOne(new QueryWrapper<SysUser>().lambda()
|
|
|
- .eq(SysUser::getMobileNumber, managerMobileNumber)
|
|
|
- .eq(SysUser::getRealName, managerName));
|
|
|
- if (Objects.isNull(sysUser) || !sysUser.getEnable()) {
|
|
|
- matchInfoError = matchInfoError + String.format("纷享销客中的客户经理[%s(%s)]在质控平台不存在或已禁用(姓名 + 手机号)\n", managerName, managerMobileNumber);
|
|
|
+// SysUser sysUser = sysUserService.getOne(new QueryWrapper<SysUser>().lambda()
|
|
|
+// .eq(SysUser::getMobileNumber, managerMobileNumber)
|
|
|
+// .eq(SysUser::getRealName, managerName));
|
|
|
+// if (Objects.isNull(sysUser) || !sysUser.getEnable()) {
|
|
|
+// matchInfoError = matchInfoError + String.format("纷享销客中的客户经理[%s(%s)]在质控平台不存在或已禁用(姓名 + 手机号)\n", managerName, managerMobileNumber);
|
|
|
+// } else {
|
|
|
+// List<RoleDto> roleDtoList = sysRoleService.listRolesByUserId(sysUser.getId());
|
|
|
+// if (roleDtoList.stream().noneMatch(e -> RoleTypeEnum.ACCOUNT_MANAGER.equals(e.getType()))) {
|
|
|
+// matchInfoError = matchInfoError + String.format("纷享销客中的客户经理[%s(%s)]在质控平台缺少[%s]角色)\n", managerName, managerMobileNumber, RoleTypeEnum.ACCOUNT_MANAGER);
|
|
|
+// } else {
|
|
|
+// crmUserId = sysUser.getId();
|
|
|
+// }
|
|
|
+// }
|
|
|
+ List<SysUser> sysUserList = sysUserService.list(new QueryWrapper<SysUser>().lambda().eq(SysUser::getRealName,managerName));
|
|
|
+ if (CollectionUtils.isEmpty(sysUserList)){
|
|
|
+ matchInfoError = matchInfoError + String.format("纷享销客中的客户经理[%s]在质控平台不存在或已禁用(姓名)\n", managerName);
|
|
|
+ } else if (sysUserList.size() > 1){
|
|
|
+ matchInfoError = matchInfoError + String.format("纷享销客中的客户经理[%s]在质控平台对应多个(可能是重名)\n", managerName);
|
|
|
} else {
|
|
|
- List<RoleDto> roleDtoList = sysRoleService.listRolesByUserId(sysUser.getId());
|
|
|
- if (roleDtoList.stream().noneMatch(e -> RoleTypeEnum.ACCOUNT_MANAGER.equals(e.getType()))) {
|
|
|
- matchInfoError = matchInfoError + String.format("纷享销客中的客户经理[%s(%s)]在质控平台缺少[%s]角色)\n", managerName, managerMobileNumber, RoleTypeEnum.ACCOUNT_MANAGER);
|
|
|
+ SysUser sysUser = sysUserList.get(0);
|
|
|
+ if (Objects.isNull(sysUser) || !sysUser.getEnable()) {
|
|
|
+ matchInfoError = matchInfoError + String.format("纷享销客中的客户经理[%s]在质控平台不存在或已禁用(姓名)\n", managerName);
|
|
|
} else {
|
|
|
- crmUserId = sysUser.getId();
|
|
|
+ List<RoleDto> roleDtoList = sysRoleService.listRolesByUserId(sysUser.getId());
|
|
|
+ if (roleDtoList.stream().noneMatch(e -> RoleTypeEnum.ACCOUNT_MANAGER.equals(e.getType()))) {
|
|
|
+ matchInfoError = matchInfoError + String.format("纷享销客中的客户经理[%s]在质控平台缺少[%s]角色)\n", managerName, RoleTypeEnum.ACCOUNT_MANAGER);
|
|
|
+ } else {
|
|
|
+ crmUserId = sysUser.getId();
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|