bug修改

src/main/java/com/chuanghai/ihotel/controller/HotelAdminController.java

@@ -54,14 +54,16 @@ public class HotelAdminController {
     /**
      * 管理员列表
      * @param adminToken 管理员token
+     * @param keyword 关键字搜索，支持手机号和姓名搜索
      * @param pageParam 分页参数
      * @return
      */
     @AdminLoginCheck
     @GetMapping("/list")
     public CommonResult<PageUtils<HotelAdminEntity>> list(@RequestHeader("admin_token") String adminToken,
+                                                          String keyword,
                                                           PageParam pageParam){
-        PageUtils page = hotelAdminService.queryPage(pageParam);
+        PageUtils page = hotelAdminService.queryPage(pageParam, keyword);
 
         return CommonResult.ok().setResult(page);
     }

src/main/java/com/chuanghai/ihotel/controller/HotelStaffController.java

@@ -37,12 +37,17 @@ public class HotelStaffController {
 
     /**
      * 员工列表
+     * @param adminToken 管理员token
+     * @param keyword 关键字，支持姓名和手机号搜索
+     * @param pageParam 分页参数
+     * @return
      */
     @AdminLoginCheck
     @GetMapping("/list")
     public CommonResult<PageUtils<HotelStaffEntity>> list(@RequestHeader("admin_token") String adminToken,
+                                                          String keyword,
                                                           PageParam pageParam){
-        PageUtils page = hotelStaffService.queryPage(pageParam);
+        PageUtils page = hotelStaffService.queryPage(pageParam, keyword);
 
         return CommonResult.ok().setResult(page);
     }

src/main/java/com/chuanghai/ihotel/service/HotelAdminService.java

@@ -16,7 +16,7 @@ import com.chuanghai.ihotel.vo.LoginUserVO;
  */
 public interface HotelAdminService extends IService<HotelAdminEntity> {
 
-    PageUtils queryPage(PageParam pageParam);
+    PageUtils queryPage(PageParam pageParam, String keyword);
 
     /**
      * 登录

src/main/java/com/chuanghai/ihotel/service/HotelStaffService.java

@@ -14,6 +14,6 @@ import com.chuanghai.ihotel.entity.HotelStaffEntity;
  */
 public interface HotelStaffService extends IService<HotelStaffEntity> {
 
-    PageUtils queryPage(PageParam pageParam);
+    PageUtils queryPage(PageParam pageParam, String keyword);
 }
 

src/main/java/com/chuanghai/ihotel/service/impl/HotelAdminServiceImpl.java

@@ -20,6 +20,7 @@ import com.chuanghai.ihotel.common.utils.PageParam;
 import com.chuanghai.ihotel.dao.HotelAdminDao;
 import com.chuanghai.ihotel.entity.HotelAdminEntity;
 import com.chuanghai.ihotel.service.HotelAdminService;
+import org.springframework.util.StringUtils;
 
 
 @Service("hotelAdminService")
@@ -29,10 +30,15 @@ public class HotelAdminServiceImpl extends ServiceImpl<HotelAdminDao, HotelAdmin
     private String privateKey;
 
     @Override
-    public PageUtils queryPage(PageParam pageParam) {
+    public PageUtils queryPage(PageParam pageParam, String keyword) {
+        QueryWrapper<HotelAdminEntity> queryWrapper = new QueryWrapper<>();
+        if (StringUtils.hasText(keyword)) {
+            queryWrapper.and(e -> e.eq("username", keyword).or().eq("phone", keyword));
+        }
+
         IPage<HotelAdminEntity> page = this.page(
                 new MyQuery<HotelAdminEntity>().getPage(pageParam),
-                new QueryWrapper<>()
+                queryWrapper
         );
 
         return new PageUtils(page);

src/main/java/com/chuanghai/ihotel/service/impl/HotelStaffServiceImpl.java

@@ -11,16 +11,22 @@ import com.chuanghai.ihotel.common.utils.PageParam;
 import com.chuanghai.ihotel.dao.HotelStaffDao;
 import com.chuanghai.ihotel.entity.HotelStaffEntity;
 import com.chuanghai.ihotel.service.HotelStaffService;
+import org.springframework.util.StringUtils;
 
 
 @Service("hotelStaffService")
 public class HotelStaffServiceImpl extends ServiceImpl<HotelStaffDao, HotelStaffEntity> implements HotelStaffService {
 
     @Override
-    public PageUtils queryPage(PageParam pageParam) {
+    public PageUtils queryPage(PageParam pageParam, String keyword) {
+        QueryWrapper<HotelStaffEntity> queryWrapper = new QueryWrapper<>();
+        if (StringUtils.hasText(keyword)) {
+            queryWrapper.and(e -> e.eq("username", keyword).or().eq("phone", keyword));
+        }
+
         IPage<HotelStaffEntity> page = this.page(
                 new MyQuery<HotelStaffEntity>().getPage(pageParam),
-                new QueryWrapper<>()
+                queryWrapper
         );
 
         return new PageUtils(page);