浏览代码

--update queryOne();

zzy.zhiyuan.foxmail 8 年之前
父节点
当前提交
cff305b7a7

+ 0 - 8
src/main/java/com/ekexiu/portal/po/Article.java

@ -8,7 +8,6 @@ import org.jfw.apt.orm.core.enums.DE;
8 8

9 9
import com.ekexiu.portal.basepo.CreateTimeSupported;
10 10
import com.ekexiu.portal.basepo.ModifyTimeSupported;
11
import com.ekexiu.portal.pojo.EditProfessor;
12 11

13 12
@Table
14 13
@PrimaryKey("articleId")
@ -24,7 +23,6 @@ public class Article implements CreateTimeSupported, ModifyTimeSupported {
24 23
	private String articleImg;
25 24
	private String orgId;
26 25
	private String articleType;
27
	private EditProfessor professor;
28 26
	
29 27
	@Column(DE.id_32)
30 28
	public String getArticleId() {
@ -87,12 +85,6 @@ public class Article implements CreateTimeSupported, ModifyTimeSupported {
87 85
	public void setArticleImg(String articleImg) {
88 86
		this.articleImg = articleImg;
89 87
	}
90
	public EditProfessor getProfessor() {
91
		return professor;
92
	}
93
	public void setProfessor(EditProfessor professor) {
94
		this.professor = professor;
95
	}
96 88
	@Column(handlerClass=FixLenStringHandler.class,dbType="CHAR(32)",nullable=true,renewable=false)
97 89
	public String getOrgId() {
98 90
		return orgId;

+ 1 - 20
src/main/java/com/ekexiu/portal/service/ArticleService.java

@ -32,8 +32,6 @@ import com.ekexiu.portal.dao.ProfessorDao;
32 32
import com.ekexiu.portal.dao.ResearchAreaDao;
33 33
import com.ekexiu.portal.dao.ResourceDao;
34 34
import com.ekexiu.portal.po.Article;
35
import com.ekexiu.portal.pojo.EditOrganization;
36
import com.ekexiu.portal.pojo.EditProfessor;
37 35
import com.ekexiu.portal.pojo.FindInfo;
38 36

39 37
@Path("/article")
@ -242,24 +240,7 @@ public class ArticleService {
242 240
	@Get
243 241
	@Path("/query")
244 242
	public Article queryOne(@JdbcConn Connection con, String articleId) throws SQLException{
245
		Article article = this.articleDao.queryOne(con, articleId);
246
		if(article != null){
247
			if(article.getProfessorId() != null){
248
				EditProfessor professor = this.professorDao.queryBaseInfo(con, article.getProfessorId());
249
				if(professor != null){
250
					professor.setHasHeadImage(this.imageService.hasProfessorImage(professor.getId()));
251
					professor.setResearchAreas(this.researchAreaDao.query(con, professor.getId()));
252
					professor.setResources(this.resourceDao.queryPro(con, professor.getId()));
253
				}
254
				article.setProfessor(professor);
255
			}else if(article.getOrgId() != null){
256
				EditOrganization organization = this.orgDao.queryEditOrg(con, article.getOrgId());
257
				if(organization != null){
258
					organization.setHasOrgLogo(this.imageService.hasOrgLogo(organization.getId()));
259
				}
260
			}
261
		}
262
		return article;
243
		return this.articleDao.queryOne(con, articleId);
263 244
	}
264 245
	
265 246
	@Get