1.修复资产实收款统计 市场人员具备多个部门岗位时 子查询结果>1 导致报错

2.修复开票列表查询条件

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

@@ -181,7 +181,7 @@
         assets.`name` AS orderName,
         (
         SELECT
-        department.name
+        GROUP_CONCAT( department.name SEPARATOR '、' )
         FROM
         department,
         post,
@@ -192,6 +192,7 @@
         AND user_post.post_id = post.id
         AND post.department_id = department.id
         AND `user`.id = assets.client_manager_id
+        AND user_post.deleted = 0
         ) AS marketDepartment,
         ( SELECT department.name FROM department WHERE department.id = assets.department_id ) AS evaluateDepartment,
         managerUser.name AS clientManagerName,

service/src/main/java/com/dayou/service/impl/FinanceInvoiceServiceImpl.java

@@ -102,7 +102,7 @@ public class FinanceInvoiceServiceImpl extends ServiceImpl<FinanceInvoiceMapper,
     public List<FinanceInvoice> getList(Long id, Long productionFundId) {
         List<FinanceInvoice> list = this.list(new LambdaQueryWrapper<FinanceInvoice>()
                 .eq(FinanceInvoice::getOrderFundId, id)
-                .eq(ObjectUtil.isNotNull(productionFundId),FinanceInvoice::getProductionFundId, productionFundId)
+                .eq(FinanceInvoice::getProductionFundId, productionFundId)
                 .orderByDesc(BaseEntity::getCreated));
         return list;
     }