Merge remote-tracking branch 'origin/busUser' into zhairh

# Conflicts:
#	api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvSubWarehouseController.java

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

@@ -1,11 +1,13 @@
 package com.glxp.api.admin.controller.inventory;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
 import com.github.pagehelper.PageInfo;
 import com.glxp.api.admin.annotation.AuthRuleAnnotation;
 import com.glxp.api.admin.entity.auth.AuthAdmin;
 import com.glxp.api.admin.entity.info.SystemParamConfigEntity;
+import com.glxp.api.admin.entity.business.InvSpace;
 import com.glxp.api.admin.entity.inout.WarehouseBussinessTypeEntity;
 import com.glxp.api.admin.entity.inventory.InvSubWarehouseEntity;
 import com.glxp.api.admin.entity.inventory.InvWarehouseEntity;
@@ -21,6 +23,7 @@ import com.glxp.api.admin.service.info.SystemParamConfigService;
 import com.glxp.api.admin.service.inout.WarehouseBussinessTypeService;
 import com.glxp.api.admin.service.inout.WarehouseUserService;
 import com.glxp.api.admin.service.inventory.InvProductService;
+import com.glxp.api.admin.service.inventory.InvSpaceService;
 import com.glxp.api.admin.service.inventory.InvSubWarehouseService;
 import com.glxp.api.admin.service.inventory.InvWarehouseService;
 import com.glxp.api.common.enums.ResultEnum;
@@ -53,7 +56,9 @@ public class InvSubWarehouseController {
     @Resource
     private WarehouseUserService warehouseUserService;
     @Resource
-    SystemParamConfigService systemParamConfigService;
+    private InvSpaceService invSpaceService;
+    @Resource
+    private SystemParamConfigService systemParamConfigService;
 
     @AuthRuleAnnotation("")
     @GetMapping("spms/sub/inv/warehouse/filter")
@@ -73,7 +78,7 @@ public class InvSubWarehouseController {
 
         AuthAdmin authAdmin = customerService.getUserBean();
         if (filterInvWarehouseRequest.getFilter() == null || filterInvWarehouseRequest.getFilter() == 1 || StrUtil.isNotEmpty(filterInvWarehouseRequest.getPcode())) {
-            if (null != authAdmin.getCustomerId() && authAdmin.getCustomerId() == 110)
+            if (authAdmin.getCustomerId().equals("110"))
                 filterInvWarehouseRequest.setUserId(authAdmin.getId().intValue());
             else{
                 filterInvWarehouseRequest.setSpUse(true);
@@ -205,6 +210,12 @@ public class InvSubWarehouseController {
             return ResultVOUtils.error(500, "此分库存在库存，不能删除！");
         }
 
+        //判断此分库下是否有货位
+        List<InvSpace> spaceList = invSpaceService.findBySubWarehouseCode(invSubWarehouse.getCode());
+        if (CollUtil.isNotEmpty(spaceList)) {
+            return ResultVOUtils.error(500, "请先移除此分库下的货位！");
+        }
+
         boolean b = invSubWarehouseService.deleteById(deleteRequest.getId());
 
         if (!b) {