仓库管理的查询的添加登录账号查询条件

src/main/java/com/boco/nbd/wios/manage/entity/dto/WarehouseQuery.java

@@ -39,6 +39,8 @@ public class WarehouseQuery {
 
 
     @ApiModelProperty(value = "安装服务商")
     @ApiModelProperty(value = "安装服务商")
     private String serviceProvider;
     private String serviceProvider;
+    @ApiModelProperty(value = "创建用户")
+    private String createAccount;
 
 
     @ApiModelProperty(value = "分页起始数据",required = true)
     @ApiModelProperty(value = "分页起始数据",required = true)
     private Integer page;
     private Integer page;
@@ -125,4 +127,12 @@ public class WarehouseQuery {
     public void setPagecount(Integer pagecount) {
     public void setPagecount(Integer pagecount) {
         this.pagecount = pagecount;
         this.pagecount = pagecount;
     }
     }
+
+    public String getCreateAccount() {
+        return createAccount;
+    }
+
+    public void setCreateAccount(String createAccount) {
+        this.createAccount = createAccount;
+    }
 }
 }

src/main/java/com/boco/nbd/wios/manage/mapper/extdb/WarehouseMapperEx.java

@@ -80,7 +80,7 @@ public interface WarehouseMapperEx {
      * @param warehouseAttribution
      * @param warehouseAttribution
      * @return
      * @return
      */
      */
-    List<WarehouseEx> qryWarehouseList(@Param("id") String id, @Param("appkey") String appkey, @Param("warehouseLevenId")String warehouseLevenId, @Param("name")String name, @Param("isEnable")Integer isEnable, @Param("serviceProviders")List<String> serviceProviders, @Param("area")String area, @Param("warehouseAttribution")String warehouseAttribution);
+    List<WarehouseEx> qryWarehouseList(@Param("id") String id, @Param("appkey") String appkey, @Param("warehouseLevenId")String warehouseLevenId, @Param("name")String name, @Param("isEnable")Integer isEnable, @Param("serviceProviders")List<String> serviceProviders, @Param("area")String area, @Param("warehouseAttribution")String warehouseAttribution,@Param("createAccount")String createAccount);
 
 
 
 
     /**
     /**

src/main/java/com/boco/nbd/wios/manage/service/impl/WarehouseService.java

@@ -262,7 +262,7 @@ public class WarehouseService {
         if (org.apache.commons.lang3.StringUtils.isNotBlank(warehouseQuery.getServiceProvider())) {
         if (org.apache.commons.lang3.StringUtils.isNotBlank(warehouseQuery.getServiceProvider())) {
             serviceProviders = Arrays.asList(warehouseQuery.getServiceProvider().split(CamsConstant.COMMA));
             serviceProviders = Arrays.asList(warehouseQuery.getServiceProvider().split(CamsConstant.COMMA));
         }
         }
-        List<WarehouseEx> warehouseList = warehouseMapperEx.qryWarehouseList(warehouseQuery.getId(), warehouseQuery.getAppkey(), warehouseQuery.getWarehouseLevenId(), warehouseQuery.getName(), warehouseQuery.getIsEnable(), serviceProviders, warehouseQuery.getArea(), warehouseQuery.getWarehouseAttribution());
+        List<WarehouseEx> warehouseList = warehouseMapperEx.qryWarehouseList(warehouseQuery.getId(), warehouseQuery.getAppkey(), warehouseQuery.getWarehouseLevenId(), warehouseQuery.getName(), warehouseQuery.getIsEnable(), serviceProviders, warehouseQuery.getArea(), warehouseQuery.getWarehouseAttribution(),warehouseQuery.getCreateAccount());
 
 
 
 
         BaseResponse<List<WarehouseDTO>> response;
         BaseResponse<List<WarehouseDTO>> response;
@@ -767,7 +767,7 @@ public class WarehouseService {
         if (org.apache.commons.lang3.StringUtils.isNotBlank(warehouseQuery.getServiceProvider())) {
         if (org.apache.commons.lang3.StringUtils.isNotBlank(warehouseQuery.getServiceProvider())) {
             serviceProviders = Arrays.asList(warehouseQuery.getServiceProvider().split(CamsConstant.COMMA));
             serviceProviders = Arrays.asList(warehouseQuery.getServiceProvider().split(CamsConstant.COMMA));
         }
         }
-        List<WarehouseEx> warehouseList = warehouseMapperEx.qryWarehouseList(warehouseQuery.getId(), warehouseQuery.getAppkey(), warehouseQuery.getWarehouseLevenId(), warehouseQuery.getName(), warehouseQuery.getIsEnable(), serviceProviders, warehouseQuery.getArea(), warehouseQuery.getWarehouseAttribution());
+        List<WarehouseEx> warehouseList = warehouseMapperEx.qryWarehouseList(warehouseQuery.getId(), warehouseQuery.getAppkey(), warehouseQuery.getWarehouseLevenId(), warehouseQuery.getName(), warehouseQuery.getIsEnable(), serviceProviders, warehouseQuery.getArea(), warehouseQuery.getWarehouseAttribution(),warehouseQuery.getCreateAccount());
 
 
 
 
         if (CollUtil.isNotEmpty(warehouseList)) {
         if (CollUtil.isNotEmpty(warehouseList)) {
@@ -809,7 +809,7 @@ public class WarehouseService {
         if (org.apache.commons.lang3.StringUtils.isNotBlank(warehouseQuery.getServiceProvider())) {
         if (org.apache.commons.lang3.StringUtils.isNotBlank(warehouseQuery.getServiceProvider())) {
             serviceProviders = Arrays.asList(warehouseQuery.getServiceProvider().split(CamsConstant.COMMA));
             serviceProviders = Arrays.asList(warehouseQuery.getServiceProvider().split(CamsConstant.COMMA));
         }
         }
-        List<WarehouseEx> warehouseList = warehouseMapperEx.qryWarehouseList(warehouseQuery.getId(), warehouseQuery.getAppkey(), warehouseQuery.getWarehouseLevenId(), warehouseQuery.getName(), warehouseQuery.getIsEnable(), serviceProviders, warehouseQuery.getArea(), warehouseQuery.getWarehouseAttribution());
+        List<WarehouseEx> warehouseList = warehouseMapperEx.qryWarehouseList(warehouseQuery.getId(), warehouseQuery.getAppkey(), warehouseQuery.getWarehouseLevenId(), warehouseQuery.getName(), warehouseQuery.getIsEnable(), serviceProviders, warehouseQuery.getArea(), warehouseQuery.getWarehouseAttribution(),warehouseQuery.getCreateAccount());
 
 
         BaseResponse<List<WarehouseDTO>> warehouseResponse = new BaseResponse<>(new ArrayList<>());
         BaseResponse<List<WarehouseDTO>> warehouseResponse = new BaseResponse<>(new ArrayList<>());
         List<WarehouseDTO> result = new ArrayList<>();
         List<WarehouseDTO> result = new ArrayList<>();

src/main/resources/mybatis/mapper/extdb/common/WarehouseMapperEx.xml

@@ -113,6 +113,9 @@
         <if test="warehouseAttribution != null and warehouseAttribution != ''">
         <if test="warehouseAttribution != null and warehouseAttribution != ''">
             and tw.warehouse_attribution = #{warehouseAttribution}
             and tw.warehouse_attribution = #{warehouseAttribution}
         </if>
         </if>
+        <if test="createAccount != null and createAccount != ''">
+            and tw.create_account = #{createAccount}
+        </if>
         <if test="name != null and name != ''">
         <if test="name != null and name != ''">
             and tw.name like CONCAT('%',#{name},'%')
             and tw.name like CONCAT('%',#{name},'%')
         </if>
         </if>