From a33217549606663afd562fd064fbd002b3145abe Mon Sep 17 00:00:00 2001
From: anthonyywj2 <353682448@qq.com>
Date: Tue, 16 Aug 2022 16:07:23 +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 +++++++++++----
 .../glxp/api/admin/thread/OrderSubmitTask.java    |  3 +++
 .../resources/mybatis/mapper/auth/DeptDao.xml     |  3 +++
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java
index baee3c50..44a8e90e 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java
@@ -21,6 +21,7 @@ import com.glxp.api.admin.entity.inout.OrderEntity;
 import com.glxp.api.admin.entity.inout.WarehouseBussinessTypeEntity;
 import com.glxp.api.admin.entity.inout.WarehouseEntity;
 import com.glxp.api.admin.entity.inout.WarehouseUserEntity;
+import com.glxp.api.admin.entity.inventory.InvBusUserEntity;
 import com.glxp.api.admin.entity.inventory.InvProductDetailEntity;
 import com.glxp.api.admin.entity.inventory.InvSubWarehouseEntity;
 import com.glxp.api.admin.exception.JsonException;
@@ -44,10 +45,7 @@ import com.glxp.api.admin.service.business.StockOrderService;
 import com.glxp.api.admin.service.info.CompanyProductRelevanceService;
 import com.glxp.api.admin.service.info.SystemParamConfigService;
 import com.glxp.api.admin.service.inout.*;
-import com.glxp.api.admin.service.inventory.InvPreInProductDetailService;
-import com.glxp.api.admin.service.inventory.InvPreProductDetailService;
-import com.glxp.api.admin.service.inventory.InvProductDetailService;
-import com.glxp.api.admin.service.inventory.InvSubWarehouseService;
+import com.glxp.api.admin.service.inventory.*;
 import com.glxp.api.admin.thread.IoTransInoutService;
 import com.glxp.api.admin.util.*;
 import com.glxp.api.common.enums.ResultEnum;
@@ -112,6 +110,9 @@ public class WareHouseController {
     @Resource
     private UdiInfoService udiInfoService;
 
+    @Resource
+    InvBusUserService invBusUserService;
+
     @AuthRuleAnnotation("")
     @GetMapping("admin/warehouse/inout/list")
     public BaseResponse list(WarehouseQueryRequest warehouseQueryRequest) {
@@ -1299,6 +1300,12 @@ 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/java/com/glxp/api/admin/thread/OrderSubmitTask.java b/api-admin/src/main/java/com/glxp/api/admin/thread/OrderSubmitTask.java
index 8b099f76..d11c46e8 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/thread/OrderSubmitTask.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/thread/OrderSubmitTask.java
@@ -118,6 +118,9 @@ public class OrderSubmitTask implements SchedulingConfigurer {
                             for (String orderId : orderIds) {
 
                                 StockOrderEntity stockOrderEntity = stockOrderService.findByBillNo(orderId);
+                                if (stockOrderEntity == null) {
+                                    continue;
+                                }
                                 OrderEntity orderEntity = orderService.findById(stockOrderEntity.getOrderIdFk());
                                 if (StrUtil.isNotEmpty(syncUploadDataSetEntity.getOrderStartTime())) {
                                     if (orderEntity.getActDate().length() > 10) {
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 88e9e8aa..01554923 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>