From d3523a669c75338b160d4afc4b6caab76282c20f Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Thu, 9 Mar 2023 13:55:03 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/glxp/api/service/inv/impl/InvCountOrderServiceImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvCountOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvCountOrderServiceImpl.java
index a94e29a5e..b88925008 100644
--- a/src/main/java/com/glxp/api/service/inv/impl/InvCountOrderServiceImpl.java
+++ b/src/main/java/com/glxp/api/service/inv/impl/InvCountOrderServiceImpl.java
@@ -120,7 +120,7 @@ public class InvCountOrderServiceImpl implements InvCountOrderService {
     public BaseResponse saveCountOrder(InvCountOrderEntity invCountOrder) {
         if (invCountOrder.getCountType() == 0 || invCountOrder.getCountType() == 2) {
             //整库盘点
-            if (StrUtil.isNotBlank(invCountOrder.getDeptCode()) || StrUtil.isBlank(invCountOrder.getInvCode())) {
+            if (StrUtil.isBlank(invCountOrder.getDeptCode()) || StrUtil.isBlank(invCountOrder.getInvCode())) {
                 return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "请选择仓库信息！");
             }
         } else if (invCountOrder.getCountType() == 1) {

From 6dc5bb55ee3ee04fc113d99f36fd6247bc0a4bb0 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Thu, 9 Mar 2023 14:12:31 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
index 24355c68a..b8d4a9d57 100644
--- a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
+++ b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
@@ -854,7 +854,7 @@
                 AND nameCode = #{nameCode}
             </if>
             <if test="isDisable != null">
-                AND isDisable = #{isDisable}
+                AND isUseDy = #{isDisable}
             </if>
         </where>
 

From 8c8291c5d873eff36b3ac82ca2714ecd32697792 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Thu, 9 Mar 2023 15:17:34 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=93=E5=BA=93bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../glxp/api/controller/auth/InvWarehouseController.java    | 1 +
 src/main/resources/mybatis/mapper/auth/InvBusUserDao.xml    | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java
index 490709b12..ff62952dd 100644
--- a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java
+++ b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java
@@ -474,6 +474,7 @@ public class InvWarehouseController extends BaseController {
             return ResultVOUtils.error(500, "仓库编码不能为空！");
         FilterInvBusUserRequest filterInvBusUserRequest = new FilterInvBusUserRequest();
             filterInvBusUserRequest.setSubInvCode(relBusRequset.getInvCode());
+        filterInvBusUserRequest.setSelectedCodes(relBusRequset.getSelectActions());
             List<InvBusUserEntity> invBusUserEntities = invBusUserService.filterInvBusUser(filterInvBusUserRequest);
         List<String> objects = new ArrayList<>();
         List<String> objects2 = new ArrayList<>();
diff --git a/src/main/resources/mybatis/mapper/auth/InvBusUserDao.xml b/src/main/resources/mybatis/mapper/auth/InvBusUserDao.xml
index 2ed0fc0cd..897eb5cf7 100644
--- a/src/main/resources/mybatis/mapper/auth/InvBusUserDao.xml
+++ b/src/main/resources/mybatis/mapper/auth/InvBusUserDao.xml
@@ -17,6 +17,12 @@
             <if test="scAction != '' and scAction != null">
                 AND scAction = #{scAction}
             </if>
+            <if test="selectedCodes != null and selectedCodes.size()!=0">
+                and scAction not in
+                <foreach collection="selectedCodes" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
 
         </where>
 

From 1a9bc3856cfa0b38ac9b6327e48b2f79653619ad Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Thu, 9 Mar 2023 16:34:06 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
index b8d4a9d57..cc509ea20 100644
--- a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
+++ b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
@@ -854,8 +854,9 @@
                 AND nameCode = #{nameCode}
             </if>
             <if test="isDisable != null">
-                AND isUseDy = #{isDisable}
+                AND isDisable = #{isDisable}
             </if>
+
         </where>
 
         group by basic_udirel.id