11

src/main/java/com/ekexiu/portal/system/SysMailService.java

@@ -19,6 +19,8 @@ import org.jfw.util.exception.JfwBaseException;
import com.ekexiu.portal.dao.OrgDao;
import com.ekexiu.portal.mail.MailService;
import com.ekexiu.portal.po.Organization;
import com.ekexiu.portal.pojo.EditOrganization;
import com.ekexiu.portal.service.ImageService;
@Path()
public class SysMailService {
@@ -35,7 +37,19 @@ public class SysMailService {
	@Autowrie
	private OrgInviteLogDao orgInviteLogDao;
	
	@Autowrie
	private ImageService imageService;
	
	
	
	public ImageService getImageService() {
		return imageService;
	}
	public void setImageService(ImageService imageService) {
		this.imageService = imageService;
	}
	public long getTimeoutOfOrgInviteLog() {
		return timeoutOfOrgInviteLog;
@@ -134,12 +148,16 @@ public class SysMailService {
	
	@Get
	@Path("/queryOrgByOrgInviteLogId")
	public Organization queryOrgByOrgInviteLogId(@JdbcConn Connection con,String code)throws SQLException{
	public EditOrganization queryOrgByOrgInviteLogId(@JdbcConn Connection con,String code)throws SQLException{
		OrgInviteLog log = this.orgInviteLogDao.query(con,code);
		if(log!=null){
			String time = DateUtil.formatDateTime(System.currentTimeMillis()-this.timeoutOfOrgInviteLog);
			if(time.compareTo(log.getCreateTime())<=0){
				return this.orgDao.query(con,log.getOid());
				EditOrganization eo = this.orgDao.queryEditOrg(con,log.getOid());
				if(eo!=null){
					eo.setHasOrgLogo(this.imageService.hasOrgLogo(eo.getId()));
					return eo;
				}
			}
		}
		return null;