1:未收付统计 客户别名

2:客户对账 总部选择了branchid 查询条件 增加 branchid

blade-service/blade-los/src/main/java/org/springblade/los/finance/fee/mapper/FinAccBillsMapper.xml

@@ -574,7 +574,7 @@
     </select>
     <select id="feeSummaryDetailNotList" resultType="org.springblade.los.statisticAnalysis.FeeSummaryDetailNotRD">
         SELECT
-            acc.corp_id,acc.corp_cn_name , acc.branch_id,
+            acc.corp_id,acc.corp_cn_name corpName, acc.branch_id,
             acc.business_bill_no billNo,
             acc.vessel_en_name vesselName,
             acc.voyage_no voyageNo,
@@ -668,7 +668,7 @@
     <select id="feeSummaryDetailExportNotList"
             resultType="org.springblade.los.statisticAnalysis.FeeSummaryDetailNotRD">
         SELECT
-        acc.corp_id,acc.corp_cn_name , acc.branch_id,
+        acc.corp_id,acc.corp_cn_name corpName, acc.branch_id,
         acc.business_bill_no billNo,
         acc.vessel_en_name vesselName,
         acc.voyage_no voyageNo,

blade-service/blade-los/src/main/java/org/springblade/los/finance/fee/service/impl/FinAccBillsServiceImpl.java

@@ -423,7 +423,13 @@ public class FinAccBillsServiceImpl extends ServiceImpl<FinAccBillsMapper, FinAc
 		if (!AuthUtil.getUserRole().contains("总部") && !AuthUtil.getUserRole().contains("admin")) {
 			finAccBills.setBranchId(AuthUtil.getDeptId());
 		} else {
-			finAccBills.setBranchId(null);
+			if (StringUtil.isNotBlank(finAccBills.getBranchId())) {
+				finAccBills.setBranchId(finAccBills.getBranchId());
+			}
+			else
+			{
+				finAccBills.setBranchId(null);
+			}
 		}
 		return billsMapper.listAccBill(finAccBills);
 	}