修改bug

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())) {

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);

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;
+
 
 }

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

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">