|
|
@@ -302,7 +302,7 @@
|
|
|
nm_order o
|
|
|
LEFT JOIN nm_profit_sharing_info b ON o.org_code = b.org_code
|
|
|
WHERE
|
|
|
- o.profit_sharing_status IN (0, 1, 2)
|
|
|
+ o.profit_sharing_status IN (0, 1, 2) AND o.pay_status = 1
|
|
|
GROUP BY
|
|
|
o.org_code
|
|
|
) settled ON a.org_code = settled.org_code
|
|
|
@@ -386,7 +386,7 @@
|
|
|
a.price > 0
|
|
|
AND a.type NOT IN (3, 4, 6)
|
|
|
AND b.pre_amount > 0
|
|
|
- AND c.org_code = #{orgCode}
|
|
|
+ AND c.org_code = #{orgCode} AND b.type = 1
|
|
|
<!-- 动态条件 -->
|
|
|
<if test="incomeExpenseType != null and incomeExpenseType != '' and incomeExpenseType != '全部'">
|
|
|
AND (
|