Explorar el Código

邮件问题处理

Signed-off-by: anderx <312518615@qq.com>
anderx hace 5 años
padre
commit
3a4cfcab52

+ 3 - 3
src/main/java/com/goafanti/common/task/PatentTask.java

@@ -97,7 +97,7 @@ public class PatentTask {
 						n.setContent(str2+",aid="+p.getAid());
 						nlist.add(n);
 							continue;
-					 }else if (!SendEmailUtil.isEmail(p.getEmail())) {
+					 }else if (!SendEmailUtil.isEmail(p.getEmail().trim())) {
 						n.setContent(str2+",管理员="+a.getName());
 						nlist.add(n);
 						//再发一条给管理员
@@ -227,8 +227,8 @@ public class PatentTask {
 	}
 	
 	
-
-		
+	
+	
 	/**
          * @param htmlStr
          * @return

+ 4 - 2
src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java

@@ -1530,12 +1530,14 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 		LockingReleaseBo l=list.get(0);
 		UserLockRelease ul=new UserLockRelease();
 		ul.setId(l.getId());
-		ul.setStatus(2);
+//		不做释放与锁定的动作
+//		ul.setStatus(2);
+		ul.setAid(inputId);
 //		不修改时间
 //		ul.setReleaseTime(now);
 		userLockReleaseMapper.updateByPrimaryKeySelective(ul);
 		addtransferLog(uid,pid,TokenManager.getAdminId(),inputId,1);
-		addUserLock(uid,inputId,1,pid,now); //指定用户锁定客户
+//		addUserLock(uid,inputId,1,pid,now); //指定用户锁定客户
 		List<BusinessListBo> bl=userBusinessMapper.selectBusinessProjectByUAPid(uid, TokenManager.getAdminId(), pid);
 		if (bl.size()==1) {
 			UserBusiness ub=new UserBusiness();