feature：订单管理页面查询

order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInfoController.java

@@ -139,12 +139,17 @@ public class OrderInfoController {
                 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) {

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}