From bb7177cd2e32abaf17bdd4addf13b88c54ad16af Mon Sep 17 00:00:00 2001
From: byteblogs168 <598092184@qq.com>
Date: Sat, 14 Jan 2023 19:57:44 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=88=97=E8=A1=A8=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/user/UserList.vue          | 77 ++++---------------
 .../service/impl/SystemUserServiceImpl.java   |  9 ++-
 .../web/model/request/SystemUserQueryVO.java  |  5 ++
 3 files changed, 30 insertions(+), 61 deletions(-)

diff --git a/frontend/src/views/user/UserList.vue b/frontend/src/views/user/UserList.vue
index 5470644a..b4c2aa04 100644
--- a/frontend/src/views/user/UserList.vue
+++ b/frontend/src/views/user/UserList.vue
@@ -1,66 +1,23 @@
 <template>
   <a-card :bordered="false">
 
-<!--    <div class="table-page-search-wrapper">-->
-<!--      <a-form layout="inline">-->
-<!--        <a-row :gutter="48">-->
-<!--          <a-col :md="8" :sm="24">-->
-<!--            <a-form-item label="规则编号">-->
-<!--              <a-input v-model="queryParam.id" placeholder=""/>-->
-<!--            </a-form-item>-->
-<!--          </a-col>-->
-<!--          <a-col :md="8" :sm="24">-->
-<!--            <a-form-item label="使用状态">-->
-<!--              <a-select v-model="queryParam.status" placeholder="请选择" default-value="0">-->
-<!--                <a-select-option value="0">全部</a-select-option>-->
-<!--                <a-select-option value="1">关闭</a-select-option>-->
-<!--                <a-select-option value="2">运行中</a-select-option>-->
-<!--              </a-select>-->
-<!--            </a-form-item>-->
-<!--          </a-col>-->
-<!--          <template v-if="advanced">-->
-<!--            <a-col :md="8" :sm="24">-->
-<!--              <a-form-item label="调用次数">-->
-<!--                <a-input-number v-model="queryParam.callNo" style="width: 100%"/>-->
-<!--              </a-form-item>-->
-<!--            </a-col>-->
-<!--            <a-col :md="8" :sm="24">-->
-<!--              <a-form-item label="更新日期">-->
-<!--                <a-date-picker v-model="queryParam.date" style="width: 100%" placeholder="请输入更新日期"/>-->
-<!--              </a-form-item>-->
-<!--            </a-col>-->
-<!--            <a-col :md="8" :sm="24">-->
-<!--              <a-form-item label="使用状态">-->
-<!--                <a-select v-model="queryParam.useStatus" placeholder="请选择" default-value="0">-->
-<!--                  <a-select-option value="0">全部</a-select-option>-->
-<!--                  <a-select-option value="1">关闭</a-select-option>-->
-<!--                  <a-select-option value="2">运行中</a-select-option>-->
-<!--                </a-select>-->
-<!--              </a-form-item>-->
-<!--            </a-col>-->
-<!--            <a-col :md="8" :sm="24">-->
-<!--              <a-form-item label="使用状态">-->
-<!--                <a-select placeholder="请选择" default-value="0">-->
-<!--                  <a-select-option value="0">全部</a-select-option>-->
-<!--                  <a-select-option value="1">关闭</a-select-option>-->
-<!--                  <a-select-option value="2">运行中</a-select-option>-->
-<!--                </a-select>-->
-<!--              </a-form-item>-->
-<!--            </a-col>-->
-<!--          </template>-->
-<!--          <a-col :md="!advanced && 8 || 24" :sm="24">-->
-<!--            <span class="table-page-search-submitButtons" :style="advanced && { float: 'right', overflow: 'hidden' } || {} ">-->
-<!--              <a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button>-->
-<!--              <a-button style="margin-left: 8px" @click="() => queryParam = {}">重置</a-button>-->
-<!--              <a @click="toggleAdvanced" style="margin-left: 8px">-->
-<!--                {{ advanced ? '收起' : '展开' }}-->
-<!--                <a-icon :type="advanced ? 'up' : 'down'"/>-->
-<!--              </a>-->
-<!--            </span>-->
-<!--          </a-col>-->
-<!--        </a-row>-->
-<!--      </a-form>-->
-<!--    </div>-->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline">
+        <a-row :gutter="48">
+          <a-col :md="8" :sm="24">
+            <a-form-item label="用户名">
+              <a-input v-model="queryParam.username" placeholder="请输入用户名"/>
+            </a-form-item>
+          </a-col>
+          <a-col :md="!advanced && 8 || 24" :sm="24">
+            <span class="table-page-search-submitButtons" :style="advanced && { float: 'right', overflow: 'hidden' } || {} ">
+              <a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button>
+              <a-button style="margin-left: 8px" @click="() => queryParam = {}">重置</a-button>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
 
     <div class="table-operator">
       <a-button type="primary" icon="plus" @click="handleNew()">新建</a-button>
diff --git a/x-retry-server/src/main/java/com/x/retry/server/service/impl/SystemUserServiceImpl.java b/x-retry-server/src/main/java/com/x/retry/server/service/impl/SystemUserServiceImpl.java
index 4b3fe265..36cb0da5 100644
--- a/x-retry-server/src/main/java/com/x/retry/server/service/impl/SystemUserServiceImpl.java
+++ b/x-retry-server/src/main/java/com/x/retry/server/service/impl/SystemUserServiceImpl.java
@@ -20,6 +20,7 @@ import com.x.retry.server.web.model.base.PageResult;
 import com.x.retry.server.web.model.request.SystemUserQueryVO;
 import com.x.retry.server.web.model.request.SystemUserRequestVO;
 import com.x.retry.server.web.model.response.SystemUserResponseVO;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -170,7 +171,13 @@ public class SystemUserServiceImpl implements SystemUserService {
     public PageResult<List<SystemUserResponseVO>> getSystemUserPageList(SystemUserQueryVO queryVO) {
         PageDTO<SystemUser> userPageDTO = new PageDTO<>(queryVO.getPage(), queryVO.getSize());
 
-        userPageDTO = systemUserMapper.selectPage(userPageDTO, new LambdaQueryWrapper<>());
+        LambdaQueryWrapper<SystemUser> systemUserLambdaQueryWrapper = new LambdaQueryWrapper<>();
+
+        if (StringUtils.isNotBlank(queryVO.getUsername())) {
+            systemUserLambdaQueryWrapper.like(SystemUser::getUsername, "%" + queryVO.getUsername() + "%");
+        }
+
+        userPageDTO = systemUserMapper.selectPage(userPageDTO, systemUserLambdaQueryWrapper.orderByDesc(SystemUser::getId));
 
         List<SystemUserResponseVO> userResponseVOList = systemUserResponseVOConverter.batchConvert(userPageDTO.getRecords());
 
diff --git a/x-retry-server/src/main/java/com/x/retry/server/web/model/request/SystemUserQueryVO.java b/x-retry-server/src/main/java/com/x/retry/server/web/model/request/SystemUserQueryVO.java
index 6c22285c..976482db 100644
--- a/x-retry-server/src/main/java/com/x/retry/server/web/model/request/SystemUserQueryVO.java
+++ b/x-retry-server/src/main/java/com/x/retry/server/web/model/request/SystemUserQueryVO.java
@@ -1,11 +1,16 @@
 package com.x.retry.server.web.model.request;
 
 import com.x.retry.server.web.model.base.BaseQueryVO;
+import lombok.Data;
 
 /**
  * @author www.byteblogs.com
  * @date 2022-03-06
  * @since 2.0
  */
+@Data
 public class SystemUserQueryVO extends BaseQueryVO {
+
+    private String username;
+
 }