计费单据查询单价;

mhd-modules/mhd-system/src/main/resources/mapper/basic/ExpenseAccountMapper.xml

@@ -107,12 +107,12 @@
     <select id="selectCostSubject" parameterType="com.mhd.basic.domain.expenseAccount.repository.todo.ExpenseAccountDO"
             resultType="com.mhd.basic.domain.expenseAccount.repository.po.ExpenseAccountPO">
         select
-            *
-        from expense_account
+        a.*
+        from expense_account a left join service_items_manage b ON a.service_items_manage_id = b.service_items_manage_id
         where
-            del_flag = 1
-          and status = 1
-          and first_subject_flag = 1
+        a.del_flag = 1
+          and a.status = 1
+          and a.first_subject_flag = 1
         <include refid="common_where_two"></include>
     </select>
     <select id="selectAllCostSubject"
@@ -149,11 +149,15 @@
         <!-- 如果 organizationId 和 topOrganizationId 都为 null，表示查询所有组织的数据（不添加组织过滤条件） -->
         <if test="expenseAccountDO.organizationId != null">
             <!-- 如果设置了 organizationId，添加 organization_id 条件 -->
-            and organization_id = #{expenseAccountDO.organizationId}
+            and a.organization_id = #{expenseAccountDO.organizationId}
         </if>
         <if test="expenseAccountDO.topOrganizationId != null and expenseAccountDO.organizationId == null">
             <!-- 如果设置了 topOrganizationId 但没有设置 organizationId，添加 top_organization_id 条件 -->
-            and top_organization_id = #{expenseAccountDO.topOrganizationId}
+            and a.top_organization_id = #{expenseAccountDO.topOrganizationId}
+        </if>
+        <if test="expenseAccountDO.serviceItemsCode != null and expenseAccountDO.serviceItemsCode != ''">
+            <!-- 如果设置了 topOrganizationId 但没有设置 organizationId，添加 top_organization_id 条件 -->
+            and b.service_items_code = #{expenseAccountDO.serviceItemsCode}
         </if>
     </sql>