From 4015080a5d94abea7ce7ad8d888170abaef5583f Mon Sep 17 00:00:00 2001
From: anthonyywj2 <353682448@qq.com>
Date: Tue, 16 Aug 2022 16:06:37 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/inout/WareHouseController.java     | 15 +++++++++++----
 .../resources/mybatis/mapper/auth/DeptDao.xml     |  3 +++
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java
index ffe8974..2333076 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java
@@ -15,6 +15,7 @@ import com.glxp.sale.admin.entity.basic.BussinessTypeEntity;
 import com.glxp.sale.admin.entity.basic.UdiInfoEntity;
 import com.glxp.sale.admin.entity.info.CompanyEntity;
 import com.glxp.sale.admin.entity.inout.*;
+import com.glxp.sale.admin.entity.inventory.InvBusUserEntity;
 import com.glxp.sale.admin.entity.inventory.InvProductDetailEntity;
 import com.glxp.sale.admin.entity.inventory.InvSubWarehouseEntity;
 import com.glxp.sale.admin.entity.param.SystemParamConfigEntity;
@@ -38,10 +39,7 @@ import com.glxp.sale.admin.service.basic.UdiRelevanceService;
 import com.glxp.sale.admin.service.info.CompanyProductRelevanceService;
 import com.glxp.sale.admin.service.info.CompanyService;
 import com.glxp.sale.admin.service.inout.*;
-import com.glxp.sale.admin.service.inventory.InvPreInProductDetailService;
-import com.glxp.sale.admin.service.inventory.InvPreProductDetailService;
-import com.glxp.sale.admin.service.inventory.InvProductDetailService;
-import com.glxp.sale.admin.service.inventory.InvSubWarehouseService;
+import com.glxp.sale.admin.service.inventory.*;
 import com.glxp.sale.admin.service.param.SystemParamConfigService;
 import com.glxp.sale.admin.thread.IoTransInoutService;
 import com.glxp.sale.admin.util.*;
@@ -107,6 +105,10 @@ public class WareHouseController {
     @Resource
     InvSubWarehouseService invSubWarehouseService;
 
+    @Resource
+    InvBusUserService invBusUserService;
+
+
     @AuthRuleAnnotation("")
     @GetMapping("admin/warehouse/inout/list")
     public BaseResponse list(WarehouseQueryRequest warehouseQueryRequest) {
@@ -1301,6 +1303,11 @@ public class WareHouseController {
         if (null == id)
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
         WarehouseUserEntity warehouseUserEntity = warehouseUserService.selectById(id);
+
+        List<InvBusUserEntity> invBusUserEntities = invBusUserService.selectByUnion(warehouseUserEntity.getUserid() + "", warehouseUserEntity.getCode());
+        if (CollUtil.isNotEmpty(invBusUserEntities)) {
+            return ResultVOUtils.error(500, "已存在该用户关联单据类型，无法删除！");
+        }
         InvSubWarehouseEntity invSubWarehouseEntity =
                 invSubWarehouseService.findByInvSubByCode(warehouseUserEntity.getCode());
         invWarehouseService.updateTime(invSubWarehouseEntity.getParentId(), new Date());
diff --git a/api-admin/src/main/resources/mybatis/mapper/auth/DeptDao.xml b/api-admin/src/main/resources/mybatis/mapper/auth/DeptDao.xml
index 4bf8f3c..664c881 100644
--- a/api-admin/src/main/resources/mybatis/mapper/auth/DeptDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/auth/DeptDao.xml
@@ -8,6 +8,9 @@
         SELECT *
         FROM auth_dept
         <where>
+            <if test="flag != null and flag != ''">
+                and flag = #{flag}
+            </if>
             <if test="name != null and '' != name">
                 AND `name` LIKE CONCAT('%',#{name},'%')
             </if>