原汇率逻辑增加所属公司

blade-service/blade-los/src/main/java/org/springblade/los/basic/cur/service/impl/BCurrencyServiceImpl.java

@@ -221,6 +221,7 @@ public class BCurrencyServiceImpl extends ServiceImpl<CurrencyMapper, BCurrency>
 		BCurrency detail = baseMapper.selectById(bCurrency.getId());
 		detail.setCurExrateList(bCurExrateService.list(new LambdaQueryWrapper<BCurExrate>()
 			.eq(BCurExrate::getIsDeleted, 0)
+			.eq(BCurExrate::getBranchId, AuthUtil.getDeptId())
 			.eq(BCurExrate::getTenantId, AuthUtil.getTenantId())
 			.eq(BCurExrate::getCode, detail.getCode())
 		));
@@ -238,6 +239,7 @@ public class BCurrencyServiceImpl extends ServiceImpl<CurrencyMapper, BCurrency>
 			BCurrency detail = baseMapper.selectOne(new LambdaQueryWrapper<BCurrency>()
 				.eq(BCurrency::getTenantId, AuthUtil.getTenantId())
 				.eq(BCurrency::getIsDeleted, 0)
+				.eq(BCurrency::getBranchId, AuthUtil.getDeptId())
 				.eq(BCurrency::getCnName, item.getCnName()));
 			if (detail == null) {
 				BeanUtil.copy(item, bCurrency);
@@ -272,6 +274,7 @@ public class BCurrencyServiceImpl extends ServiceImpl<CurrencyMapper, BCurrency>
 		BCurrency bCurrency = baseMapper.selectOne(new LambdaQueryWrapper<BCurrency>()
 			.eq(BCurrency::getTenantId, AuthUtil.getTenantId())
 			.eq(BCurrency::getIsDeleted, 0)
+			.eq(BCurrency::getBranchId, AuthUtil.getDeptId())
 			.eq(BCurrency::getCode, curCode));
 		if (ObjectUtils.isNotNull(bCurrency) && ObjectUtils.isNotNull(bCurrency.getExrate()) &&
 			new BigDecimal("0.00").compareTo(bCurrency.getExrate()) != 0) {
@@ -282,6 +285,7 @@ public class BCurrencyServiceImpl extends ServiceImpl<CurrencyMapper, BCurrency>
 				.eq(BCurExrate::getCode, curCode)
 				.eq(BCurExrate::getTenantId, AuthUtil.getTenantId())
 				.eq(BCurExrate::getIsDeleted, 0)
+				.eq(BCurExrate::getBranchId, AuthUtil.getDeptId())
 				.eq(BCurExrate::getExrateYear, year);
 			if ("1".equals(type)) {
 				String status = sysClient.getParamService("business.exchange.rate");
@@ -422,6 +426,7 @@ public class BCurrencyServiceImpl extends ServiceImpl<CurrencyMapper, BCurrency>
 		BCurrency bCurrency = baseMapper.selectOne(new LambdaQueryWrapper<BCurrency>()
 			.eq(BCurrency::getTenantId, AuthUtil.getTenantId())
 			.eq(BCurrency::getIsDeleted, 0)
+			.eq(BCurrency::getBranchId, AuthUtil.getDeptId())
 			.eq(BCurrency::getCode, curCode));
 		if (ObjectUtils.isNotNull(bCurrency) && ObjectUtils.isNotNull(bCurrency.getExrate()) &&
 			new BigDecimal("0.00").compareTo(bCurrency.getExrate()) != 0) {
@@ -432,6 +437,7 @@ public class BCurrencyServiceImpl extends ServiceImpl<CurrencyMapper, BCurrency>
 				.eq(BCurExrate::getCode, curCode)
 				.eq(BCurExrate::getTenantId, AuthUtil.getTenantId())
 				.eq(BCurExrate::getIsDeleted, 0)
+				.eq(BCurExrate::getBranchId, AuthUtil.getDeptId())
 				.eq(BCurExrate::getExrateYear, year);
 			if ("1".equals(type)) {
 				String status = sysClient.getParamService("business.exchange.rate");
@@ -530,6 +536,7 @@ public class BCurrencyServiceImpl extends ServiceImpl<CurrencyMapper, BCurrency>
 		BCurrency bCurrency = baseMapper.selectOne(new LambdaQueryWrapper<BCurrency>()
 			.eq(BCurrency::getTenantId, AuthUtil.getTenantId())
 			.eq(BCurrency::getIsDeleted, 0)
+			.eq(BCurrency::getBranchId, AuthUtil.getDeptId())
 			.eq(BCurrency::getCode, curCode));
 		if (ObjectUtils.isNotNull(bCurrency) && ObjectUtils.isNotNull(bCurrency.getExrate()) &&
 			new BigDecimal("0.00").compareTo(bCurrency.getExrate()) != 0) {
@@ -540,6 +547,7 @@ public class BCurrencyServiceImpl extends ServiceImpl<CurrencyMapper, BCurrency>
 				.eq(BCurExrate::getCode, curCode)
 				.eq(BCurExrate::getTenantId, AuthUtil.getTenantId())
 				.eq(BCurExrate::getIsDeleted, 0)
+				.eq(BCurExrate::getBranchId, AuthUtil.getDeptId())
 				.eq(BCurExrate::getExrateYear, year);
 			if ("1".equals(type)) {
 				String status = sysClient.getParamService("business.exchange.rate");
@@ -634,6 +642,7 @@ public class BCurrencyServiceImpl extends ServiceImpl<CurrencyMapper, BCurrency>
 		List<BCurrency> bCurrencyList = baseMapper.selectList(new LambdaQueryWrapper<BCurrency>()
 			.eq(BCurrency::getTenantId, AuthUtil.getTenantId())
 			.eq(BCurrency::getIsDeleted, 0)
+			.eq(BCurrency::getBranchId, AuthUtil.getDeptId())
 			.eq(BCurrency::getStatus, 0));
 		for (BCurrency details : bCurrencyList) {
 			if (1 == details.getIsLocal()) {
@@ -645,6 +654,7 @@ public class BCurrencyServiceImpl extends ServiceImpl<CurrencyMapper, BCurrency>
 						.eq(BCurExrate::getCode, details.getCode())
 						.eq(BCurExrate::getTenantId, AuthUtil.getTenantId())
 						.eq(BCurExrate::getIsDeleted, 0)
+						.eq(BCurExrate::getBranchId, AuthUtil.getDeptId())
 						.eq(BCurExrate::getExrateYear, year);
 					String status = sysClient.getParamService("business.exchange.rate");
 					if (ObjectUtils.isNotNull(status)) {