1.其他收支明细表

applications/money/money-server/src/main/resources/mapper/BanksubledgerMapper.xml

@@ -471,13 +471,17 @@
     </select>
 
     <select id="selectCalculateFields" resultType="string">
-        select   ${fields}  from banksubledger
+--         select   ${fields}  from banksubledger
+        select ${fields}
+        from
+        (select  bl_date, bl_code, bl_kind,bl_bankcode,bl_bankid, bl_bankname, bl_income, bl_spending, bl_assname, bl_remark, companyid
+        from banksubledger where bl_kind in ('其他收入单', '其他支出单'))a
         <where>
             <if test="con != null">
                 ${con}
             </if>
             <if test="companyId != null">
-                and  companyId = #{companyId} and bl_kind = '其他支出单' or bl_kind = '其他收入单'
+                and  companyId = #{companyId}
             </if>
         </where>
     </select>