提交代码

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/service/impl/DeliveryServiceImpl.java

@@ -1223,6 +1223,7 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 		//校验当前租户配置,如果存在配置,返回token
 		LambdaQueryWrapper<JdTenant> jdTenantLambdaQueryWrapper=new LambdaQueryWrapper<>();
 		jdTenantLambdaQueryWrapper
+			.last("limit 1")
 			.eq(JdTenant::getTenantId,AuthUtil.getTenantId())
 			.eq(JdTenant::getIsEnable,1);
 		JdTenant jdTenant = jdTenantMapper.selectOne(jdTenantLambdaQueryWrapper);

blade-service/trade-finance/src/main/java/org/springblade/finance/service/impl/SettlementServiceImpl.java

@@ -1331,7 +1331,7 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 		d.setExplanation("供应商付款-"+ corpName);
 		d.setAccount_number(dModule.getProjectCode());
 		d.setDebitamount(Account);
-		entriesList.add(d);
+
 
 		//财务贷方
 		JDYentries c = new JDYentries();
@@ -1395,8 +1395,9 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 			jdYassist2.setNumber(jdCorps2.getCorpsCode());
 		}
 		cList.add(jdYassist2);
-		c.setAssist(cList);
+		d.setAssist(cList);
 		//===========辅助核算=================
+		entriesList.add(d);
 		entriesList.add(c);
 
 		//组装数据