--update queryOrgRalateRes();

src/main/java/com/ekexiu/portal/service/ResourceService.java

@@ -570,11 +570,19 @@ public class ResourceService {
		if(!resources.isEmpty()){
			for (Resource resource : resources) {
				resource.setImages(this.imagesService.queryRes(con, resource.getResourceId()));
				EditProfessor professor = this.professorDao.queryBaseInfo(con, resource.getProfessorId());
				if(professor != null){
					professor.setHasHeadImage(this.imageService.hasProfessorImage(professor.getId()));
				if(resource.getProfessorId() != null){
					EditProfessor professor = this.professorDao.queryBaseInfo(con, resource.getProfessorId());
					if(professor != null){
						professor.setHasHeadImage(this.imageService.hasProfessorImage(professor.getId()));
					}
					resource.setEditProfessor(professor);
				}else if(resource.getOrgId() != null){
					EditOrganization organization = this.orgDao.queryEditOrg(con, resource.getOrgId());
					if(organization != null){
						organization.setHasOrgLogo(this.imageService.hasOrgLogo(organization.getId()));
					}
					resource.setOrganization(organization);
				}
				resource.setEditProfessor(professor);
			}
		}
		return resources;
@@ -597,11 +605,19 @@ public class ResourceService {
		if(!resources.isEmpty()){
			for (Resource resource : resources) {
				resource.setImages(this.imagesService.queryRes(con, resource.getResourceId()));
				EditOrganization organization = this.orgDao.queryEditOrg(con, resource.getOrgId());
				if(organization != null){
					organization.setHasOrgLogo(this.imageService.hasOrgLogo(organization.getId()));
				if(resource.getProfessorId() != null){
					EditProfessor professor = this.professorDao.queryBaseInfo(con, resource.getProfessorId());
					if(professor != null){
						professor.setHasHeadImage(this.imageService.hasProfessorImage(professor.getId()));
					}
					resource.setEditProfessor(professor);
				}else if(resource.getOrgId() != null){
					EditOrganization organization = this.orgDao.queryEditOrg(con, resource.getOrgId());
					if(organization != null){
						organization.setHasOrgLogo(this.imageService.hasOrgLogo(organization.getId()));
					}
					resource.setOrganization(organization);
				}
				resource.setOrganization(organization);
			}
		}
		return resources;