经纪人名片3.经纪人申请开通邮箱

yd-api/src/main/java/com/yd/api/practitioner/service/impl/PractitionerServiceImpl.java

@@ -5194,10 +5194,10 @@ public class PractitionerServiceImpl implements com.yd.api.practitioner.service.
             resp.setCommonResult(new CommonResult(false, "经纪人ID不可为空"));
             resp.setCommonResult(new CommonResult(false, "经纪人ID不可为空"));
             return resp;
             return resp;
         }
         }
-        if (Strings.isNullOrEmpty(requestVO.getEmail())) {
-            resp.setCommonResult(new CommonResult(false, "经纪人申请的邮箱地址不可为空"));
-            return resp;
-        }
+//        if (Strings.isNullOrEmpty(requestVO.getEmail())) {
+//            resp.setCommonResult(new CommonResult(false, "经纪人申请的邮箱地址不可为空"));
+//            return resp;
+//        }
         //等保调整
         //等保调整
         List<AclCustomer> findByObjSortable = aclPractitionerDALService.getAclCustomers(practitionerId, null);
         List<AclCustomer> findByObjSortable = aclPractitionerDALService.getAclCustomers(practitionerId, null);
         if (null == findByObjSortable) {
         if (null == findByObjSortable) {
@@ -5211,10 +5211,10 @@ public class PractitionerServiceImpl implements com.yd.api.practitioner.service.
             	resp.setCommonResult(new CommonResult(false, "经纪人银盾保险专属办公邮箱已开通,无需在申请！"));
             	resp.setCommonResult(new CommonResult(false, "经纪人银盾保险专属办公邮箱已开通,无需在申请！"));
                 return resp;
                 return resp;
             }
             }
-            if(!requestVO.getEmail().equals(practitioner.getEmail())){
-            	resp.setCommonResult(new CommonResult(false, "经纪人申请的邮箱与系统邮箱不一致,请联系管理员确认！"));
-                return resp;
-            }
+//            if(!requestVO.getEmail().equals(practitioner.getEmail())){
+//            	resp.setCommonResult(new CommonResult(false, "经纪人申请的邮箱与系统邮箱不一致,请联系管理员确认！"));
+//                return resp;
+//            }
             try {
             try {
 				//发送邮件给客服，同步跟进
 				//发送邮件给客服，同步跟进
 				String toAddress = systemConfigService.getSingleConfigValue("ApplyEmailToAddress");
 				String toAddress = systemConfigService.getSingleConfigValue("ApplyEmailToAddress");
@@ -5248,7 +5248,11 @@ public class PractitionerServiceImpl implements com.yd.api.practitioner.service.
 					if(!boole){
 					if(!boole){
 						messageText = messageText.substring(0,messageText.length()-1);
 						messageText = messageText.substring(0,messageText.length()-1);
 					}
 					}
-				    messageText += "的经纪人【"+practitioner.getName()+"】申请开通银盾保险专属办公邮箱【"+practitioner.getEmail()+"】，请您在２个工作日内帮忙开通，谢谢！";
+			        if (Strings.isNullOrEmpty(requestVO.getEmail())) {
+			        	messageText += "的经纪人【"+practitioner.getName()+"】申请开通银盾保险专属办公邮箱【"+practitioner.getEmail()+"】，请您在２个工作日内帮忙开通，谢谢！";
+			        }else{
+			        	messageText += "的经纪人【"+practitioner.getName()+"】申请开通银盾保险专属办公邮箱，请您在２个工作日内帮忙开通，谢谢！";
+			        }
 				    mailService.sysNotify(toAddress, ccAddress.split(","), subject, messageText);
 				    mailService.sysNotify(toAddress, ccAddress.split(","), subject, messageText);
 		            resp.setCommonResult(new CommonResult(true, ZHBErrorConfig.getErrorInfo("800000")));
 		            resp.setCommonResult(new CommonResult(true, ZHBErrorConfig.getErrorInfo("800000")));
 				}
 				}