1.修复罚款查询返回无操作人名字

2.修复产品退回使用关键字查询报错
3.修复已删除罚款记录还会查询出来的问题

dao/src/main/resources/mapper/FinanceFineMapper.xml

@@ -91,6 +91,7 @@
         LEFT JOIN customer_company AS subCustomer ON subCustomer.id = `order`.clientele_sub_id
         LEFT JOIN user ON `order`.client_manager_id = user.id AND user.deleted = 0
         WHERE oFund.business_type = #{dto.businessType}
+          AND fine.deleted = 0
         <if test="dto != null and dto.keyWord != null and dto.keyWord != ''">
             AND (`order`.order_id LIKE CONCAT('%', #{dto.keyWord},'%')
             <if test="dto != null and dto.businessType == 'ASSET_BUSINESS' or dto.businessType == 'MAJOR_BUSINESS'">

dao/src/main/resources/mapper/FinanceFineRefundMapper.xml

@@ -82,7 +82,7 @@
         LEFT JOIN customer_company AS customer ON customer.id = `order`.clientele_id
         LEFT JOIN customer_company AS subCustomer ON subCustomer.id = `order`.clientele_sub_id
         LEFT JOIN user ON `order`.client_manager_id = user.id AND user.deleted = 0
-        LEFT JOIN user AS operator ON user.deleted = 0 AND user.id = refund.user_id
+        LEFT JOIN user AS operator ON operator.deleted = 0 AND operator.id = refund.user_id
         WHERE oFund.business_type = #{dto.businessType}
         <if test="dto != null and dto.keyWord != null and dto.keyWord != ''">
             AND (`order`.order_id LIKE CONCAT('%', #{dto.keyWord},'%')

dao/src/main/resources/mapper/ProductionReturnMapper.xml

@@ -69,7 +69,7 @@
             AND production_return.business_type = #{dto.businessType}
         </if>
         <if test="dto != null and dto.keyWord != null and dto.keyWord != ''">
-            AND (`order`.order_id LIKE CONCAT('%', #{dto.keyWord},'%') OR pFund.production_no LIKE CONCAT('%', #{dto.keyWord},'%'))
+            AND (order_id LIKE CONCAT('%', #{dto.keyWord},'%') OR production_no LIKE CONCAT('%', #{dto.keyWord},'%'))
         </if>
         <if test="dto != null and dto.clientManagerName != null and dto.clientManagerName != ''">
             AND user.name = #{dto.clientManagerName}