From e6d60c1ba2cb7fbd9945e6d409d850c595649096 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Fri, 10 Mar 2023 10:08:47 +0800
Subject: [PATCH] =?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/res/inv/DeviceReceiveOrderResponse.java  | 5 +++++
 .../resources/mybatis/mapper/basic/UdiRelevanceDao.xml    | 8 +++++++-
 .../mybatis/mapper/inv/DeviceReceiveOrderDao.xml          | 3 +++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/glxp/api/res/inv/DeviceReceiveOrderResponse.java b/src/main/java/com/glxp/api/res/inv/DeviceReceiveOrderResponse.java
index 23d85ecb8..da23a138c 100644
--- a/src/main/java/com/glxp/api/res/inv/DeviceReceiveOrderResponse.java
+++ b/src/main/java/com/glxp/api/res/inv/DeviceReceiveOrderResponse.java
@@ -70,6 +70,11 @@ public class DeviceReceiveOrderResponse {
      */
     private String receiveUserName;
 
+    /**
+     * 领用人
+     */
+    private String receiveUser;
+
     /**
      * 领用时间
      */
diff --git a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
index cc509ea20..734958c14 100644
--- a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
+++ b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
@@ -853,9 +853,15 @@
             <if test="nameCode != null">
                 AND nameCode = #{nameCode}
             </if>
-            <if test="isDisable != null">
+            <if test="isDisable == false">
+                AND (basic_udirel.isDisable is null or basic_udirel.isDisable = false)
+            </if>
+            <if test="isDisable != null  and isDisable == true">
                 AND isDisable = #{isDisable}
             </if>
+            <if test="isDisable != null  and isDisable == false">
+                AND (isDisable is null or isDisable = false)
+            </if>
 
         </where>
 
diff --git a/src/main/resources/mybatis/mapper/inv/DeviceReceiveOrderDao.xml b/src/main/resources/mybatis/mapper/inv/DeviceReceiveOrderDao.xml
index fa02325d4..9e7d0851b 100644
--- a/src/main/resources/mybatis/mapper/inv/DeviceReceiveOrderDao.xml
+++ b/src/main/resources/mybatis/mapper/inv/DeviceReceiveOrderDao.xml
@@ -11,10 +11,13 @@
         dro.createTime,
         dro.updateTime,
         dro.STATUS,
+        dro.fromInvSpaceCode,
         dro.receiveUser,
         ( SELECT employeeName FROM auth_user WHERE id = dro.receiveUser ) receiveUserName,
         ( SELECT `name` FROM auth_dept WHERE CODE = dro.fromDeptCode ) fromDeptName,
+        ( SELECT `code` FROM auth_dept WHERE CODE = dro.fromDeptCode ) fromDeptCode,
         ( SELECT `name` FROM auth_warehouse WHERE CODE = dro.fromInvCode ) fromInvName,
+        ( SELECT `code` FROM auth_warehouse WHERE CODE = dro.fromInvCode ) fromInvCode,
         ( SELECT `name` FROM auth_space WHERE CODE = dro.fromInvSpaceCode ) fromInvSpaceName
         FROM
         device_receive_order dro