订单列表权限过滤调整

jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/logistics/controller/BizWaybillOrderController.java

@@ -44,7 +44,7 @@ public class BizWaybillOrderController extends BaseController
      */
     @RequiresPermissions("system:order:list")
     @GetMapping("/list")
-    @DataScope(deptAlias = "bwo", userAlias = "u")
+
     public TableDataInfo list(BizWaybillOrder bizWaybillOrder)
     {
         startPage();

jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/logistics/service/impl/BizWaybillOrderServiceImpl.java

@@ -57,6 +57,7 @@ public class BizWaybillOrderServiceImpl implements IBizWaybillOrderService
      * @param bizWaybillOrder 运单管理
      * @return 运单管理
      */
+    @DataScope(deptAlias = "d", userAlias = "u")
     @Override
     public List<BizWaybillOrder> selectBizWaybillOrderList(BizWaybillOrder bizWaybillOrder)
     {

jd-logistics-modules/jd-logistics-system/src/main/resources/mapper/logistics/BizWaybillOrderMapper.xml

@@ -49,11 +49,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectBizWaybillOrderVo">
-        select waybill_id, waybill_no, external_waybill_no, order_type, sender_name, sender_phone, sender_province, sender_city, sender_county, sender_address, receiver_name,
-        receiver_phone, receiver_province, receiver_city, receiver_county, receiver_address, goods_name, goods_weight, goods_volume, goods_qty, order_status, pickup_type,
-        send_start_time, send_end_time, pickup_time, delivery_time, sign_time, cancel_reason, parent_waybill_id, invoice_flag, adjust_flag, remark, create_time, update_time,
-        del_flag, create_by, update_by, dept_id, user_id, product_code, added_service
+        select bwo.waybill_id, bwo.waybill_no, bwo.external_waybill_no, bwo.order_type, bwo.sender_name, bwo.sender_phone, bwo.sender_province, bwo.sender_city, bwo.sender_county, bwo.sender_address, bwo.receiver_name,
+               bwo.receiver_phone, bwo.receiver_province, bwo.receiver_city, bwo.receiver_county, bwo.receiver_address, bwo.goods_name, bwo.goods_weight, bwo.goods_volume, bwo.goods_qty, bwo.order_status, bwo.pickup_type,
+               bwo.send_start_time, bwo.send_end_time, bwo.pickup_time, bwo.delivery_time, bwo.sign_time, bwo.cancel_reason, bwo.parent_waybill_id, bwo.invoice_flag, bwo.adjust_flag, bwo.remark, bwo.create_time, bwo.update_time,
+               bwo.del_flag, bwo.create_by, bwo.update_by, bwo.dept_id, bwo.user_id, bwo.product_code, bwo.added_service
         from biz_waybill_order bwo
+                 left join sys_user u on bwo.user_id = u.user_id
+                 left join sys_dept d on bwo.dept_id = d.dept_id
     </sql>
 
     <select id="selectBizWaybillOrderList" parameterType="com.ruoyi.logistics.domain.BizWaybillOrder" resultMap="BizWaybillOrderResult">
@@ -89,8 +91,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="parentWaybillId != null "> and parent_waybill_id = #{parentWaybillId}</if>
             <if test="invoiceFlag != null  and invoiceFlag != ''"> and invoice_flag = #{invoiceFlag}</if>
             <if test="adjustFlag != null  and adjustFlag != ''"> and adjust_flag = #{adjustFlag}</if>
-            <if test="deptId != null "> and dept_id = #{deptId}</if>
-            <if test="userId != null "> and user_id = #{userId}</if>
+
             <!-- 数据范围过滤 -->
             ${params.dataScope}
         </where>