diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/UserReplyController.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/UserReplyController.java index 4e5a16d..710b8b5 100644 --- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/UserReplyController.java +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/UserReplyController.java @@ -7,13 +7,14 @@ import com.casic.missiles.core.common.constant.factory.PageFactory; import com.casic.missiles.core.common.service.ICommonPermissionService; import com.casic.missiles.core.shiro.ShiroUser; +import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.cwscase.model.UserReply; import com.casic.missiles.modular.cwscase.service.IUserReplyService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; import java.util.List; @@ -58,19 +59,20 @@ */ @RequestMapping(value = "/listPage") @ResponseBody - public Object listPage() { + public Object listPage(String keywords) { Page page = new PageFactory().defaultPage(); - + EntityWrapper query = new EntityWrapper<>(); + if (ToolUtil.isNotEmpty(keywords)) { + query.like("content", keywords); + } ShiroUser shiroUser = service.getCurrLoginUser(); if ("admin".equals(shiroUser.getAccount())) { - page = userReplyService.selectPage(page); - }else{ + page = userReplyService.selectPage(page, query); + } else { Long userId = shiroUser.getId(); - - EntityWrapper query = new EntityWrapper<>(); - query.eq("user_id",userId); - query.orderBy("num",false); - page = userReplyService.selectPage(page,query); + query.eq("user_id", userId); + query.orderBy("num", false); + page = userReplyService.selectPage(page, query); } return ResponseData.success(super.packForBT(page));