修改bug

api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvSubWarehouseController.java

@@ -70,9 +70,8 @@ public class InvSubWarehouseController {
 //        if (StrUtil.isEmpty(filterInvWarehouseRequest.getPcode()) || filterInvWarehouseRequest.getUserId() == null) {
 //            return ResultVOUtils.error(500, "用户或仓库不能未空！");
 //        }
-
-        if (StrUtil.isNotEmpty(filterInvWarehouseRequest.getPcode())) {
         AuthAdmin authAdmin = customerService.getUserBean();
+        if (StrUtil.isNotEmpty(filterInvWarehouseRequest.getPcode())) {
             if (filterInvWarehouseRequest.getFilter() == null || filterInvWarehouseRequest.getFilter() == 1) {
                 if (authAdmin.getCustomerId().equals("110"))
                     filterInvWarehouseRequest.setUserId(authAdmin.getId() + "");
@@ -80,6 +79,12 @@ public class InvSubWarehouseController {
                     filterInvWarehouseRequest.setSpUse(true);
                 }
             }
+        } else {
+            //查询自己关联的分库
+            if(filterInvWarehouseRequest.getFilter()==3 && authAdmin.getCustomerId().equals("110")){
+                filterInvWarehouseRequest.setUserId(authAdmin.getId() + "");
+            }else if(filterInvWarehouseRequest.getFilter()==3 && !authAdmin.getCustomerId().equals("110")){
+                filterInvWarehouseRequest.setSpUse(true);
             }else{
                 //走这边表示单据选择的是往来单位里面调出调入的库
                 //判断单据类型是1就是设置单据需要需要查询除自己以外的分库
@@ -92,7 +97,7 @@ public class InvSubWarehouseController {
                     if(invSubWarehouseEntity!=null){
                         InvWarehouseEntity invWarehouseEntity = invWarehouseService.selectByCodeAll(invSubWarehouseEntity.getParentId());
                         filterInvWarehouseRequest.setSuperiorCode(invWarehouseEntity.getCode());
-                    filterInvWarehouseRequest.setSubordinateCode(invWarehouseEntity.getPcode());
+                        filterInvWarehouseRequest.setSuperiorPcode(invWarehouseEntity.getPcode());
                         filterInvWarehouseRequest.setCode(null);
                     }else {
                         return  ResultVOUtils.error(999,"分库编号为空！");
@@ -108,6 +113,8 @@ public class InvSubWarehouseController {
                 }
             }
 
+        }
+
         List<InvSubWarehouseEntity> invSubWarehouseEntities = invSubWarehouseService.filterGroupInvSub(filterInvWarehouseRequest);
         return ResultVOUtils.success(invSubWarehouseEntities);
     }

api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvWarehouseController.java

@@ -186,7 +186,7 @@ public class InvWarehouseController {
             filterInvWarehouseRequest.setPcode("0");
             filterInvWarehouseRequest.setStatus(1);
             filterInvWarehouseRequest.setSpUse(true);
-            invWarehouseEntities = invWarehouseService.filterGroupInvWarehouse(filterInvWarehouseRequest);
+            invWarehouseEntities = invWarehouseService.filterAllByUser(filterInvWarehouseRequest);
         } else {
             filterInvWarehouseRequest.setUserId(authAdmin.getId() + "");
             filterInvWarehouseRequest.setPid(0);

api-admin/src/main/java/com/glxp/sale/admin/req/inventory/FilterInvWarehouseRequest.java

@@ -28,5 +28,6 @@ public class FilterInvWarehouseRequest extends ListPageRequest {
     private int billType;//判断是否是单据类型需要的分库
     private String warehouseCode;
     private String superiorCode;//上级
+    private String superiorPcode;//上级
     private String subordinateCode;//下级
 }

api-admin/src/main/resources/mybatis/mapper/inventory/InvSubWarehouseDao.xml

@@ -49,7 +49,7 @@
                 AND inv_warehouse.spUse = #{spUse}
             </if>
             <if test="superiorCode != '' and superiorCode != null">
-                AND (inv_warehouse.code = #{subordinateCode}
+                AND (inv_warehouse.code = #{superiorPcode}
                 OR  inv_warehouse.pcode = #{superiorCode})
             </if>
             <if test="subordinateCode != '' and subordinateCode != null">