Merge remote-tracking branch 'origin/dev' into test

src/main/java/com/ekexiu/portal/leavemsg/Service.java

@@ -132,17 +132,15 @@ public class Service {
			if (article == null) {
				throw new JfwBaseException(50000, "article[" + id + "] not found");
			}
			if (article.getArticleType().equals("1")) {
				if (reciver == null) {
					if (!uid.equals(article.getProfessorId())) {
						this.notifyService.notify(con, article.getProfessorId(), uid, uname, lid, article.getArticleTitle(), NotifyType.LEAVE_MSG_AT_ARTICLE,
								runs);
					}
				} else {
					if (!uid.equals(reciver)) {
						this.notifyService.notify(con, reciver, uid, uname, lid, article.getArticleTitle(),
								agree ? NotifyType.AGREE_LEAVE_MSG_AT_ARTICLE : NotifyType.REPLY_LEAVE_MSG_AT_ARTICLE, runs);
					}
			if (reciver == null) {
				if (article.getArticleType().equals("1") && (!uid.equals(article.getProfessorId()))) {
					this.notifyService.notify(con, article.getProfessorId(), uid, uname, lid, article.getArticleTitle(), NotifyType.LEAVE_MSG_AT_ARTICLE, runs);
				}
			} else {
				if (!uid.equals(reciver)) {
					this.notifyService.notify(con, reciver, uid, uname, lid, article.getArticleTitle(),
							agree ? NotifyType.AGREE_LEAVE_MSG_AT_ARTICLE : NotifyType.REPLY_LEAVE_MSG_AT_ARTICLE, runs);
				}
			}