Merge remote-tracking branch 'origin/test'

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

						this.articleOrgDao.insert(con, articleOrg);
					}
				}
				return article.getArticleId();
			} else {
				throw new JfwBaseException(-2, "bad parameter:articleId");
			}