From c22b5eb143260a98b9aab8fc3281ffa2a5ca2eed Mon Sep 17 00:00:00 2001
From: mg <maokecheng@163.com>
Date: 星期五, 28 十月 2022 18:07:42 +0800
Subject: [PATCH] 修改

---
 ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java b/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java
index 7664f29..d313121 100644
--- a/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java
+++ b/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java
@@ -4,7 +4,6 @@
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ycl.bo.AdminUserDetails;
@@ -342,7 +341,7 @@
     }
 
     @Override
-    public IPage<UmsAdmin> pageUser(UserVO.PageUserVO pageUserVO) {
+    public Page<UmsAdmin> pageUser(UserVO.PageUserVO pageUserVO) {
         int pageSize = pageUserVO.getPageSize();
         int current = pageUserVO.getCurrent();
         Page<UmsAdmin> page = new Page<>(current, pageSize);
@@ -359,7 +358,17 @@
         if (PojoUtils.Vo.isUsefulSearchParam(pageUserVO.getUserType())) {
             queryWrapper.eq(UmsAdmin::getUserType, pageUserVO.getUserType());
         }*/
-        Page<UmsAdmin> page1 = baseMapper.selectCondPage(page,pageUserVO);
+        UmsAdmin umsAdmin = new UmsAdmin();
+        if (pageUserVO.getUserType()!=null) {
+           umsAdmin.setUserType(pageUserVO.getUserType());
+        }
+        if (pageUserVO.getKeyword()!=null&&!("".equals(pageUserVO.getKeyword()))) {
+          umsAdmin.setKeyword(pageUserVO.getKeyword());
+        }
+        if (pageUserVO.getJobTitle()!=null&&!("".equals(pageUserVO.getJobTitle()))) {
+            umsAdmin.setJobTitle(pageUserVO.getJobTitle());
+        }
+        Page<UmsAdmin> page1 = baseMapper.selectCondPage(page,umsAdmin);
 
         return page1;
     }

--
Gitblit v1.8.0