From c6bc0370cc3589d15aba53ebf569e30b7efc5a3a Mon Sep 17 00:00:00 2001
From: gaorl <gaoronglin@ele-cloud.com>
Date: Mon, 1 May 2023 16:50:31 +0800
Subject: [PATCH] =?UTF-8?q?feature=EF=BC=9A=E8=AE=A2=E5=8D=95=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E9=A1=B5=E9=9D=A2=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/order/controller/OrderInfoController.java  |  7 ++++++-
 .../mybatis/mapper/OrderProcessInfoMapper.xml          | 10 +++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInfoController.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInfoController.java
index e0608626..2f0d9cdf 100644
--- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInfoController.java
+++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInfoController.java
@@ -138,13 +138,18 @@ public class OrderInfoController {
                 log.error("{},请求税号为空!", LOGGER_MSG);
                 return R.error(OrderInfoContentEnum.TAXCODE_ISNULL);
             }
+
+            if (StringUtils.isBlank(orderBatchQuery.getEntList())) {
+                log.error("{},当前请求的部门id为空!", LOGGER_MSG);
+                return R.error(OrderInfoContentEnum.ENT_ISNULL);
+            }
     
             List<String> shList = NsrsbhUtils.transShListByXhfNsrsbh(orderBatchQuery.getXhfNsrsbh());
     
             List<String> entList = NsrsbhUtils.transShListByXhfNsrsbh(orderBatchQuery.getEntList());
     
             //查询数据库
-            PageUtils page = orderInfoService.selectOrderInfo(paramMap, shList, entList);
+            PageUtils page = orderInfoService.selectOrderInfo(paramMap, null, entList);
     
             return R.ok().put(OrderManagementConstant.DATA, page);
         } catch (Exception e) {
diff --git a/order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml b/order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml
index f0347e8d..2c5ff953 100644
--- a/order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml
+++ b/order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml
@@ -571,20 +571,20 @@
             </if>
 
             <if test="entList != null and entList.size() == 0">
-                and (op.ent_id = '' or op.ent_id is null)
+                and op.ent_id = ''
             </if>
             <if test="entList != null and entList.size() == 1">
-                and (op.ent_id =
+                and op.ent_id =
                 <foreach collection="entList" index="index" item="item">
                     #{item}
-                </foreach> or op.ent_id is null)
+                </foreach>
             </if>
             <if test="entList != null and entList.size() > 1">
-                and (op.ent_id in
+                and op.ent_id in
                 <foreach collection="entList" index="index" item="item"
                          open="(" separator="," close=")">
                     #{item}
-                </foreach> or op.ent_id is null)
+                </foreach>
             </if>
             <if test="map.bzdh != null and map.bzdh != ''">
                 and op.bzdh = #{map.bzdh,jdbcType=VARCHAR}