From f9f64870a7141973498df2b62c051e940549d1bf Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Tue, 7 Feb 2023 11:16:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/auth/InvWarehouseController.java | 16 ++++++++++++++--
 .../com/glxp/api/dao/auth/WarehouseUserDao.java |  2 ++
 .../api/req/auth/FilterInvLinkDataRequest.java  |  4 ++++
 .../auth/impl/WarehouseUserServiceImpl.java     |  2 +-
 .../mybatis/mapper/auth/WarehouseUserDao.xml    | 17 +++++++++++++++++
 5 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java
index 48669818f..0ec755607 100644
--- a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java
+++ b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java
@@ -396,8 +396,20 @@ public class InvWarehouseController extends BaseController {
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
-        List<WarehouseUserEntity> warehouseUserEntities = warehouseUserService.getWarehouseUserList(filterInvLinkDataRequest);
-        PageInfo<WarehouseUserEntity> pageInfo = new PageInfo<>(warehouseUserEntities);
+        filterInvLinkDataRequest.setUserName(filterInvLinkDataRequest.getKey());
+        List<WarehouseUserEntity> warehouseUserList = warehouseUserService.getWarehouseUserList(filterInvLinkDataRequest);
+        filterInvLinkDataRequest.setUserName(null);
+        filterInvLinkDataRequest.setEmployeeName(filterInvLinkDataRequest.getKey());
+        List<WarehouseUserEntity> warehouseUserList1 = warehouseUserService.getWarehouseUserList(filterInvLinkDataRequest);
+        PageInfo<WarehouseUserEntity> pageInfo=null;
+        if(warehouseUserList.size()!=0){
+            pageInfo= new PageInfo<>(warehouseUserList);
+        }else if(warehouseUserList1.size()!=0){
+           pageInfo = new PageInfo<>(warehouseUserList1);
+        }else{
+            pageInfo = new PageInfo<>(warehouseUserList);
+        }
+
 
         List<WarehouseUserResponse> result = new ArrayList<>();
         if (CollUtil.isNotEmpty(pageInfo.getList())) {
diff --git a/src/main/java/com/glxp/api/dao/auth/WarehouseUserDao.java b/src/main/java/com/glxp/api/dao/auth/WarehouseUserDao.java
index a397c59ac..97c6e0abf 100644
--- a/src/main/java/com/glxp/api/dao/auth/WarehouseUserDao.java
+++ b/src/main/java/com/glxp/api/dao/auth/WarehouseUserDao.java
@@ -1,6 +1,7 @@
 package com.glxp.api.dao.auth;
 
 import com.glxp.api.entity.auth.WarehouseUserEntity;
+import com.glxp.api.req.auth.FilterInvLinkDataRequest;
 import com.glxp.api.req.auth.FilterInvUserRequest;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -37,6 +38,7 @@ public interface WarehouseUserDao {
 
     List<WarehouseUserEntity> selectListByCode(@Param("code") String code);
 
+    List<WarehouseUserEntity> selectListkey(FilterInvLinkDataRequest filterInvLinkDataRequest);
     List<WarehouseUserEntity> selectCodeByUser(@Param("userId") String userId);
 
     void deleteByCode(@Param("code") String code);
diff --git a/src/main/java/com/glxp/api/req/auth/FilterInvLinkDataRequest.java b/src/main/java/com/glxp/api/req/auth/FilterInvLinkDataRequest.java
index 632ff3d45..e5f0eb935 100644
--- a/src/main/java/com/glxp/api/req/auth/FilterInvLinkDataRequest.java
+++ b/src/main/java/com/glxp/api/req/auth/FilterInvLinkDataRequest.java
@@ -10,5 +10,9 @@ import lombok.Data;
 public class FilterInvLinkDataRequest extends ListPageRequest {
 
     private String code;
+    private String key;
+    private String userName;
+    private String employeeName;
+
 
 }
diff --git a/src/main/java/com/glxp/api/service/auth/impl/WarehouseUserServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/WarehouseUserServiceImpl.java
index a7bdc0d82..2b90a86c4 100644
--- a/src/main/java/com/glxp/api/service/auth/impl/WarehouseUserServiceImpl.java
+++ b/src/main/java/com/glxp/api/service/auth/impl/WarehouseUserServiceImpl.java
@@ -124,7 +124,7 @@ public class WarehouseUserServiceImpl implements WarehouseUserService {
             int offset = (filterInvLinkDataRequest.getPage() - 1) * filterInvLinkDataRequest.getLimit();
             PageHelper.offsetPage(offset, filterInvLinkDataRequest.getLimit());
         }
-        return warehouseUserDao.selectListByCode(filterInvLinkDataRequest.getCode());
+        return warehouseUserDao.selectListkey(filterInvLinkDataRequest);
     }
 
     @Override
diff --git a/src/main/resources/mybatis/mapper/auth/WarehouseUserDao.xml b/src/main/resources/mybatis/mapper/auth/WarehouseUserDao.xml
index 80d943931..7d2475fb9 100644
--- a/src/main/resources/mybatis/mapper/auth/WarehouseUserDao.xml
+++ b/src/main/resources/mybatis/mapper/auth/WarehouseUserDao.xml
@@ -252,6 +252,23 @@
         where code = #{code}
     </select>
 
+    <select id="selectListkey"  resultType="com.glxp.api.entity.auth.WarehouseUserEntity" parameterType="com.glxp.api.req.auth.FilterInvLinkDataRequest">
+        select auth_warehouse_user.*, auth_user.employeeName
+        from auth_warehouse_user
+                 inner join auth_user on auth_user.id = auth_warehouse_user.userId
+        <where>
+            <if test="code != '' and code != null">
+                AND code = #{code}
+            </if>
+            <if test="userName != '' and userName != null">
+                AND auth_warehouse_user.userName = #{userName}
+            </if>
+            <if test="employeeName != '' and employeeName != null">
+                AND auth_user.employeeName = #{employeeName}
+            </if>
+        </where>
+    </select>
+
 
     <select id="filterList" parameterType="com.glxp.api.req.auth.FilterInvUserRequest"
             resultType="com.glxp.api.entity.auth.WarehouseUserEntity">