|
@@ -132,7 +132,7 @@ public class AccountRunningWaterServiceImpl extends ServiceImpl<AccountRunningWa
|
|
|
if (!Objects.equals(companyId, 100L)) {
|
|
|
wrapper.eq("arw.company_id", companyId);
|
|
|
} else {
|
|
|
- wrapper.eq("arw.company_id", dto.getCompanyId());
|
|
|
+ wrapper.eq(ObjectUtil.isNotEmpty(dto.getCompanyId()), "arw.company_id", dto.getCompanyId());
|
|
|
}
|
|
|
|
|
|
return wrapper;
|
|
@@ -221,6 +221,10 @@ public class AccountRunningWaterServiceImpl extends ServiceImpl<AccountRunningWa
|
|
|
throw new ServiceException("币种不能为空");
|
|
|
}
|
|
|
|
|
|
+ //赋值归属公司
|
|
|
+ dto.setCompanyId(SecurityUtils.getCompanyId());
|
|
|
+
|
|
|
+
|
|
|
// dto.setRate(ExchangeRateUtil.getCnyToCodeRate(dto.getCurrency()));
|
|
|
|
|
|
//计算汇率如果有填转人民币金额则反推
|