|
@ -127,7 +127,7 @@ public class JMJkEduArticleService extends BaseService {
|
|
sql2.append(" and currentUserRoleCode ="+currentUserRole);
|
|
sql2.append(" and currentUserRoleCode ="+currentUserRole);
|
|
sql2.append(" and currentUserRoleLevel="+currentUserRoleLevel);
|
|
sql2.append(" and currentUserRoleLevel="+currentUserRoleLevel);
|
|
if(!StringUtils.isEmpty(articleTitle)){
|
|
if(!StringUtils.isEmpty(articleTitle)){
|
|
sql2.append(" and attachedTitle like'%"+articleTitle+"%'");
|
|
|
|
|
|
sql2.append(" and articleTitle like'%"+articleTitle+"%'");
|
|
}
|
|
}
|
|
if(!StringUtils.isEmpty(sendTimeStart)){
|
|
if(!StringUtils.isEmpty(sendTimeStart)){
|
|
sendTimeStart = elasticsearchUtil.changeTime(sendTimeStart);
|
|
sendTimeStart = elasticsearchUtil.changeTime(sendTimeStart);
|
|
@ -236,7 +236,7 @@ public class JMJkEduArticleService extends BaseService {
|
|
sql2.append(" and currentUserRoleCode ="+currentUserRole);
|
|
sql2.append(" and currentUserRoleCode ="+currentUserRole);
|
|
sql2.append(" and currentUserRoleLevel="+currentUserRoleLevel);
|
|
sql2.append(" and currentUserRoleLevel="+currentUserRoleLevel);
|
|
if(!StringUtils.isEmpty(articleTitle)){
|
|
if(!StringUtils.isEmpty(articleTitle)){
|
|
sql2.append(" and attachedTitle like'%"+articleTitle+"%'");
|
|
|
|
|
|
sql2.append(" and articleTitle like'%"+articleTitle+"%'");
|
|
}
|
|
}
|
|
if(!StringUtils.isEmpty(sendTimeStart)){
|
|
if(!StringUtils.isEmpty(sendTimeStart)){
|
|
sendTimeStart = elasticsearchUtil.changeTime(sendTimeStart);
|
|
sendTimeStart = elasticsearchUtil.changeTime(sendTimeStart);
|