|
@@ -6,7 +6,7 @@ import cn.com.qmth.examcloud.api.commons.exchange.PageInfo;
|
|
import cn.com.qmth.examcloud.api.commons.security.bean.UserType;
|
|
import cn.com.qmth.examcloud.api.commons.security.bean.UserType;
|
|
import cn.com.qmth.examcloud.api.commons.security.enums.RoleMeta;
|
|
import cn.com.qmth.examcloud.api.commons.security.enums.RoleMeta;
|
|
import cn.com.qmth.examcloud.commons.exception.StatusException;
|
|
import cn.com.qmth.examcloud.commons.exception.StatusException;
|
|
-import cn.com.qmth.examcloud.commons.util.DBUtil;
|
|
|
|
|
|
+import cn.com.qmth.examcloud.commons.util.SqlUtil;
|
|
import cn.com.qmth.examcloud.core.basic.api.UserCloudService;
|
|
import cn.com.qmth.examcloud.core.basic.api.UserCloudService;
|
|
import cn.com.qmth.examcloud.core.basic.api.request.GetAllUsersByRoleReq;
|
|
import cn.com.qmth.examcloud.core.basic.api.request.GetAllUsersByRoleReq;
|
|
import cn.com.qmth.examcloud.core.basic.api.response.GetAllUsersByRoleResp;
|
|
import cn.com.qmth.examcloud.core.basic.api.response.GetAllUsersByRoleResp;
|
|
@@ -129,7 +129,7 @@ public class NoticeServiceImpl implements NoticeService {
|
|
predicates.add(cb.equal(root.get("rootOrgId"), rootOrgId));
|
|
predicates.add(cb.equal(root.get("rootOrgId"), rootOrgId));
|
|
if (!StringUtils.isNullOrEmpty(infoQuery.getTitle())) {
|
|
if (!StringUtils.isNullOrEmpty(infoQuery.getTitle())) {
|
|
predicates.add(cb.like(root.get("title"),
|
|
predicates.add(cb.like(root.get("title"),
|
|
- DBUtil.toSqlSearchPattern(infoQuery.getTitle())));
|
|
|
|
|
|
+ SqlUtil.toSqlSearchPattern(infoQuery.getTitle())));
|
|
}
|
|
}
|
|
if (null != infoQuery.getPublishStatus()) {
|
|
if (null != infoQuery.getPublishStatus()) {
|
|
predicates.add(cb.equal(root.get("noticeStatus"), infoQuery.getPublishStatus()));
|
|
predicates.add(cb.equal(root.get("noticeStatus"), infoQuery.getPublishStatus()));
|
|
@@ -316,7 +316,6 @@ public class NoticeServiceImpl implements NoticeService {
|
|
/**
|
|
/**
|
|
* 更新发布进度
|
|
* 更新发布进度
|
|
*
|
|
*
|
|
- * @param publishSchedule
|
|
|
|
* @param maxUserId
|
|
* @param maxUserId
|
|
*/
|
|
*/
|
|
@Transactional
|
|
@Transactional
|