From 1ca5584d7e3200a9af65a099bd26d3593e2ba702 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期四, 07 五月 2026 14:36:08 +0800
Subject: [PATCH] 迁移pro

---
 src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml |   19 ++++++++++++++-----
 1 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml b/src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml
index 8976a3a..0232873 100644
--- a/src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml
+++ b/src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml
@@ -23,17 +23,26 @@
         SELECT
         pro.*,
         sm.supplier_name as supplierName,
-        pl.purchase_contract_number as purchaseContractNumber,
-        su.user_name as returnUserName,
-        su1.user_name as createUserName
+        pl.purchase_contract_number as purchaseContractNumber
         FROM purchase_return_orders pro
         LEFT JOIN supplier_manage sm ON pro.supplier_id = sm.id
         LEFT JOIN purchase_ledger pl ON pl.id = pro.purchase_ledger_id
-        LEFT JOIN sys_user su ON su.user_id = pro.return_user_id
-        LEFT JOIN sys_user su1 ON su1.user_id = pro.prepared_user_id
         where 1=1
         <if test="params.no != null and params.no != '' ">
             AND pro.no LIKE CONCAT('%',#{params.no},'%')
         </if>
+        <if test="params.deptId != null">
+            AND pro.dept_id = #{params.deptId}
+        </if>
+        <if test="params.deptIds != null and params.deptIds.length > 0">
+            AND pro.dept_id IN
+            <foreach collection="params.deptIds" item="deptId" open="(" separator="," close=")">
+                #{deptId}
+            </foreach>
+        </if>
+        <if test="params.createUser != null">
+            AND pro.create_user = #{params.createUser}
+        </if>
+        ORDER BY pro.create_time DESC
     </select>
 </mapper>

--
Gitblit v1.9.3