⚡ 优化应收账单预览排序

bms-back/bms-system/src/main/resources/mapper/price/PrcOrderBillMapper.xml

@@ -694,14 +694,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{excludedBillId}
           </foreach>
         </if>
-        <choose>
-          <when test="dateType != null and dateType == 'PICKUP_DATE'">
-            order by p.pickup_date, p.order_no, p.bill_id
-          </when>
-          <otherwise>
-            order by p.biz_date, p.order_no, p.bill_id
-          </otherwise>
-        </choose>
+        order by p.bill_id
     </select>
 
     <select id="sumPrcOrderBillIncomeByCustomerPeriod" resultType="java.math.BigDecimal">

bms-back/bms-system/src/main/resources/mapper/receivable/ArBillScopeMapper.xml

@@ -11,20 +11,27 @@
         AND bill_id IN
         <foreach collection="sourceIds" item="sourceId" open="(" separator="," close=")">#{sourceId}</foreach>
     </select>
-    <!-- c 固定为客户表别名；无部门层级扩展，不按角色管理 data_scope 过滤。 -->
+    <!-- c 固定为客户表别名；销售经理可见本部门及下级部门，不按角色管理 data_scope 过滤。 -->
     <sql id="customerScope">
         <choose>
             <when test="scope != null and scope.all"/>
             <when test="scope != null and (scope.self or scope.department)">
                 AND c.del_flag = '0'
                 AND EXISTS (
-                    SELECT 1 FROM sys_user su
-                    WHERE CAST(su.user_id AS CHAR) = c.sales_user_id AND su.del_flag = '0'
-                    AND (1 = 0
-                        <if test="scope.self">OR su.user_id = #{scope.userId}</if>
-                        <if test="scope.department">OR su.dept_id = #{scope.deptId}</if>
+                        SELECT 1 FROM sys_user su
+                        WHERE CAST(su.user_id AS CHAR) = c.sales_user_id AND su.del_flag = '0'
+                        AND (1 = 0
+                            <if test="scope.self">OR su.user_id = #{scope.userId}</if>
+                            <if test="scope.department">
+                                OR EXISTS (
+                                    SELECT 1 FROM sys_dept dept
+                                    WHERE dept.dept_id = su.dept_id
+                                      AND (dept.dept_id = #{scope.deptId}
+                                           OR find_in_set(#{scope.deptId}, dept.ancestors))
+                                )
+                            </if>
+                        )
                     )
-                )
             </when>
             <otherwise>AND 1 = 0</otherwise>
         </choose>