Merge remote-tracking branch 'origin/dev' into dev

blade-service/blade-los/src/main/java/org/springblade/los/basic/cur/controller/BCurrencyController.java

@@ -41,6 +41,7 @@ import org.springblade.los.basic.cur.service.IBCurrencyService;
 import org.springblade.los.basic.cur.vo.BCurrencyVO;
 import org.springblade.los.excel.BCurrencyExcel;
 import org.springblade.los.finance.genleg.dto.PeriodExchangeRate;
+import org.springframework.mock.web.DelegatingServletInputStream;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -131,7 +132,11 @@ public class BCurrencyController extends BladeController {
 		if (!AuthUtil.getUserRole().contains("总部") && !AuthUtil.getUserRole().contains("admin")) {
 			lambdaQueryWrapper.eq(BCurrency::getBranchId, AuthUtil.getDeptId());
 		} else {
-			lambdaQueryWrapper.eq(ObjectUtils.isNotNull(bCurrency.getBranchId()), BCurrency::getBranchId, bCurrency.getBranchId());
+			if (ObjectUtils.isNotNull(bCurrency.getBranchId())) {
+         		lambdaQueryWrapper.eq(ObjectUtils.isNotNull(bCurrency.getBranchId()), BCurrency::getBranchId, bCurrency.getBranchId());
+			} else {
+				lambdaQueryWrapper.eq(BCurrency::getBranchId, AuthUtil.getDeptId());
+			}
 		}
 		IPage<BCurrency> pages = bCurrencyService.page(Condition.getPage(query), lambdaQueryWrapper);
 		return R.data(pages);

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

@@ -83,12 +83,12 @@ public class BCurrencyServiceImpl extends ServiceImpl<CurrencyMapper, BCurrency>
 		List<BCurrency> currencyList = baseMapper.selectList(new LambdaQueryWrapper<BCurrency>()
 			.eq(BCurrency::getTenantId, AuthUtil.getTenantId())
 			.eq(BCurrency::getIsDeleted, 0)
-			.eq(BCurrency::getBranchId, AuthUtil.getDeptId())
+			.eq(BCurrency::getBranchId, branchId)
 			.eq(BCurrency::getCode, bCurrency.getCode()));
 		List<BCurrency> isLocalList = baseMapper.selectList(new LambdaQueryWrapper<BCurrency>()
 			.eq(BCurrency::getTenantId, AuthUtil.getTenantId())
 			.eq(BCurrency::getIsDeleted, 0)
-			.eq(BCurrency::getBranchId, AuthUtil.getDeptId())
+			.eq(BCurrency::getBranchId, branchId)
 			.eq(BCurrency::getIsLocal, 1)
 		);
 		if (bCurrency.getId() == null) {
@@ -112,7 +112,7 @@ public class BCurrencyServiceImpl extends ServiceImpl<CurrencyMapper, BCurrency>
 				bCurExrate.setCreateUserName(AuthUtil.getUserName());
 				bCurExrate.setCreateDept(deptId);
 				bCurExrate.setCreateDeptName(deptName);
-				bCurExrate.setBranchId(deptId);
+				bCurExrate.setBranchId(branchId);
 				bCurExrate.setBranchName(deptName);
 				bCurExrate.setCode(bCurrency.getCode());
 				bCurExrate.setCnName(bCurrency.getCnName());
@@ -155,7 +155,7 @@ public class BCurrencyServiceImpl extends ServiceImpl<CurrencyMapper, BCurrency>
 					bCurExrate.setCreateUserName(AuthUtil.getUserName());
 					bCurExrate.setCreateDept(deptId);
 					bCurExrate.setCreateDeptName(deptName);
-					bCurExrate.setBranchId(deptId);
+					bCurExrate.setBranchId(branchId);
 					bCurExrate.setBranchName(deptName);
 					bCurExrate.setCode(bCurrency.getCode());
 					bCurExrate.setCnName(bCurrency.getCnName());