1.币别汇率接口增加所属公司权限条件

2.币别汇率保存接口报错修改
3.查询客户接口增加所属公司权限条件
4.对账中心，付费申请，结算中心，发票申请，销项发票列表接口增加所属公司权限条件
5.对账中心，付费申请，结算中心，发票申请，销项发票获取费用明细接口增加所属公司权限条件
6.所有报表打印增加字段所属公司对应本币字段
7.审核相关列表修改所属公司权限条件

blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/corps/entity/BCorps.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.los.basic.corps.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -54,11 +55,13 @@ public class BCorps implements Serializable {
 	 * 分公司 Id
 	 */
 	@ApiModelProperty(value = "分公司 Id")
+	@TableField(updateStrategy = FieldStrategy.IGNORED)
 	private String branchId;
 	/**
 	 * 分公司
 	 */
 	@ApiModelProperty(value = "分公司")
+	@TableField(updateStrategy = FieldStrategy.IGNORED)
 	private String branchName;
 	/**
 	 * 创建人 Id

blade-service-api/blade-los-api/src/main/java/org/springblade/los/box/entity/ExpenseApplication.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.los.box.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
@@ -44,6 +45,18 @@ public class ExpenseApplication implements Serializable {
 
 	private Long id;
 	/**
+	 * 分公司 Id
+	 */
+	@ApiModelProperty(value = "分公司 Id")
+	@TableField(updateStrategy = FieldStrategy.IGNORED)
+	private String branchId;
+	/**
+	 * 分公司
+	 */
+	@ApiModelProperty(value = "分公司")
+	@TableField(updateStrategy = FieldStrategy.IGNORED)
+	private String branchName;
+	/**
 	 * 创建人
 	 */
 	@ApiModelProperty(value = "创建人")

blade-service-api/blade-los-api/src/main/java/org/springblade/los/business/amends/entity/Amends.java

@@ -55,8 +55,15 @@ public class Amends implements Serializable {
 	 * 分公司 Id
 	 */
 	@ApiModelProperty(value = "分公司 Id")
+	@TableField(updateStrategy = FieldStrategy.IGNORED)
 	private String branchId;
 	/**
+	 * 分公司
+	 */
+	@ApiModelProperty(value = "分公司")
+	@TableField(updateStrategy = FieldStrategy.IGNORED)
+	private String branchName;
+	/**
 	 * 创建人 Id
 	 */
 	@ApiModelProperty(value = "创建人 Id")
@@ -598,5 +605,11 @@ public class Amends implements Serializable {
 	@TableField(exist = false)
 	private List<LosAuditPathsLevels> auditPathsLevels;
 
+	/**
+	 * 所属公司本币
+	 */
+	@TableField(exist = false)
+	private String exrateType;
+
 
 }

blade-service-api/blade-los-api/src/main/java/org/springblade/los/business/sea/entity/Bills.java

@@ -2326,5 +2326,11 @@ public class Bills implements Serializable {
 	@TableField(exist = false)
 	private List<LosAuditPathsLevels> auditPathsLevels;
 
+	/**
+	 * 所属公司本币
+	 */
+	@TableField(exist = false)
+	private String exrateType;
+
 
 }

blade-service-api/blade-los-api/src/main/java/org/springblade/los/finance/fee/entity/FeeCenter.java

@@ -54,8 +54,15 @@ public class FeeCenter implements Serializable {
 	 * 分公司 Id
 	 */
 	@ApiModelProperty(value = "分公司 Id")
+	@TableField(updateStrategy = FieldStrategy.IGNORED)
 	private String branchId;
 	/**
+	 * 分公司
+	 */
+	@ApiModelProperty(value = "分公司")
+	@TableField(updateStrategy = FieldStrategy.IGNORED)
+	private String branchName;
+	/**
 	 * 创建人 Id
 	 */
 	@ApiModelProperty(value = "创建人 Id")

blade-service-api/blade-los-api/src/main/java/org/springblade/los/finance/fee/entity/FinAccBills.java

@@ -53,8 +53,15 @@ public class FinAccBills implements Serializable {
 	 * 分公司 Id
 	 */
 	@ApiModelProperty(value = "分公司 Id")
+	@TableField(updateStrategy = FieldStrategy.IGNORED)
 	private String branchId;
 	/**
+	 * 分公司
+	 */
+	@ApiModelProperty(value = "分公司")
+	@TableField(updateStrategy = FieldStrategy.IGNORED)
+	private String branchName;
+	/**
 	 * 创建人 Id
 	 */
 	@ApiModelProperty(value = "创建人 Id")

blade-service-api/blade-los-api/src/main/java/org/springblade/los/finance/invoices/entity/FinInvoices.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.los.finance.invoices.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -54,8 +55,15 @@ public class FinInvoices implements Serializable {
 	 * 分公司 Id
 	 */
 	@ApiModelProperty(value = "分公司 Id")
+	@TableField(updateStrategy = FieldStrategy.IGNORED)
 	private String branchId;
 	/**
+	 * 分公司
+	 */
+	@ApiModelProperty(value = "分公司")
+	@TableField(updateStrategy = FieldStrategy.IGNORED)
+	private String branchName;
+	/**
 	 * 创建人 Id
 	 */
 	@ApiModelProperty(value = "创建人 Id")
@@ -660,5 +668,11 @@ public class FinInvoices implements Serializable {
 	@TableField(exist = false)
 	private String salesman;
 
+	/**
+	 * 所属公司本币
+	 */
+	@TableField(exist = false)
+	private String exrateType;
+
 
 }

blade-service-api/blade-los-api/src/main/java/org/springblade/los/finance/invoices/entity/FinInvoicesItems.java

@@ -52,8 +52,15 @@ public class FinInvoicesItems implements Serializable {
 	 * 分公司 Id
 	 */
 	@ApiModelProperty(value = "分公司 Id")
+	@TableField(updateStrategy = FieldStrategy.IGNORED)
 	private String branchId;
 	/**
+	 * 分公司
+	 */
+	@ApiModelProperty(value = "分公司")
+	@TableField(updateStrategy = FieldStrategy.IGNORED)
+	private String branchName;
+	/**
 	 * 创建人 Id
 	 */
 	@ApiModelProperty(value = "创建人 Id")

blade-service-api/blade-los-api/src/main/java/org/springblade/los/finance/stl/entity/FinStlBills.java

@@ -55,8 +55,15 @@ public class FinStlBills implements Serializable {
 	 * 分公司 Id
 	 */
 	@ApiModelProperty(value = "分公司 Id")
+	@TableField(updateStrategy = FieldStrategy.IGNORED)
 	private String branchId;
 	/**
+	 * 分公司
+	 */
+	@ApiModelProperty(value = "分公司")
+	@TableField(updateStrategy = FieldStrategy.IGNORED)
+	private String branchName;
+	/**
 	 * 创建人 Id
 	 */
 	@ApiModelProperty(value = "创建人 Id")
@@ -649,5 +656,11 @@ public class FinStlBills implements Serializable {
 	@TableField(exist = false)
 	private String salesman;
 
+	/**
+	 * 所属公司本币
+	 */
+	@TableField(exist = false)
+	private String exrateType;
+
 
 }

blade-service-api/blade-los-api/src/main/java/org/springblade/los/finance/stl/entity/FinStlBillsItems.java

@@ -52,8 +52,15 @@ public class FinStlBillsItems implements Serializable {
 	 * 分公司 Id
 	 */
 	@ApiModelProperty(value = "分公司 Id")
+	@TableField(updateStrategy = FieldStrategy.IGNORED)
 	private String branchId;
 	/**
+	 * 分公司
+	 */
+	@ApiModelProperty(value = "分公司")
+	@TableField(updateStrategy = FieldStrategy.IGNORED)
+	private String branchName;
+	/**
 	 * 创建人 Id
 	 */
 	@ApiModelProperty(value = "创建人 Id")

blade-service/blade-los/src/main/java/org/springblade/los/Util/CurrencyUtils.java

@@ -83,7 +83,7 @@ public class CurrencyUtils {
 		}
 		boolean status = false;
 		//获取业务汇率范围
-		String exchangeRateType = sysClient.getParamServiceNew("business.exchange.rate");
+		String exchangeRateType = sysClient.getParamService("business.exchange.rate");
 		if ("1".equals(type)) {
 			if (ObjectUtils.isNotNull(exchangeRateType)) {
 				status = true;

blade-service/blade-los/src/main/java/org/springblade/los/basic/acc/service/impl/AccountsServiceImpl.java

@@ -332,7 +332,7 @@ public class AccountsServiceImpl extends ServiceImpl<AccountsMapper, Accounts> i
 
 	@Override
 	public Long getAccountsCode(Long code) {
-		String coding = sysClient.getParamServiceNew("subject.coding");
+		String coding = sysClient.getParamService("subject.coding");
 		if (ObjectUtils.isNull(coding)) {
 			throw new RuntimeException("请先配置科目代码规则参数");
 		}

blade-service/blade-los/src/main/java/org/springblade/los/basic/cntr/controller/BCntrTypesController.java

@@ -110,7 +110,7 @@ public class BCntrTypesController extends BladeController {
 			.eq(ObjectUtils.isNotNull(bCntrTypes.getIsReefer()), BCntrTypes::getIsReefer, bCntrTypes.getIsReefer())
 			.eq(ObjectUtils.isNotNull(bCntrTypes.getStatus()), BCntrTypes::getStatus, bCntrTypes.getStatus())
 			.like(ObjectUtils.isNotNull(bCntrTypes.getCode95()), BCntrTypes::getCode95, bCntrTypes.getCode95());
-		String status = sysClient.getParamServiceNew("basic.data.sort");
+		String status = sysClient.getParamService("basic.data.sort");
 		if ("name".equals(status)) {
 			lambdaQueryWrapper.orderByAsc(BCntrTypes::getCnName);
 		} else if ("letter".equals(status)) {

blade-service/blade-los/src/main/java/org/springblade/los/basic/commodity/controller/BCommodityController.java

@@ -89,7 +89,7 @@ public class BCommodityController extends BladeController {
 			.like(ObjectUtils.isNotNull(bCommodity.getNcmCode()), BCommodity::getNcmCode, bCommodity.getNcmCode())
 			.like(ObjectUtils.isNotNull(bCommodity.getCnName()), BCommodity::getCnName, bCommodity.getCnName())
 			.like(ObjectUtils.isNotNull(bCommodity.getStatus()), BCommodity::getStatus, bCommodity.getStatus());
-		String status = sysClient.getParamServiceNew("basic.data.sort");
+		String status = sysClient.getParamService("basic.data.sort");
 		if ("name".equals(status)) {
 			lambdaQueryWrapper.orderByAsc(BCommodity::getCnName);
 		} else if ("letter".equals(status)) {

blade-service/blade-los/src/main/java/org/springblade/los/basic/corps/controller/BCorpsController.java

@@ -130,7 +130,7 @@ public class BCorpsController extends BladeController {
 			.like(ObjectUtils.isNotNull(bCorps.getTel()), BCorps::getTel, bCorps.getTel())
 			.like(ObjectUtils.isNotNull(bCorps.getAdminProfiles()), BCorps::getAdminProfiles, bCorps.getAdminProfiles());
 		lambdaQueryWrapper.apply(ObjectUtils.isNotNull(bCorps.getCorpType()), "find_in_set('" + bCorps.getCorpType() + "',corp_type)");
-		String status = sysClient.getParamServiceNew("basic.data.sort");
+		String status = sysClient.getParamService("basic.data.sort");
 		if ("name".equals(status)) {
 			lambdaQueryWrapper.orderByDesc(BCorps::getCnName);
 		} else if ("letter".equals(status)) {
@@ -138,6 +138,12 @@ public class BCorpsController extends BladeController {
 		} else {
 			lambdaQueryWrapper.orderByDesc(BCorps::getCreateTime);
 		}
+		if (!AuthUtil.getUserRole().contains("总部") && !AuthUtil.getUserRole().contains("admin")) {
+			lambdaQueryWrapper.apply("(find_in_set('" + AuthUtil.getDeptId() + "',branch_id) or branch_id is null)");
+		} else {
+			lambdaQueryWrapper.eq(ObjectUtils.isNotNull(bCorps.getBranchId()), BCorps::getBranchId, bCorps.getBranchId());
+		}
+
 		IPage<BCorps> pages = bCorpsService.page(Condition.getPage(query), lambdaQueryWrapper);
 		for (BCorps item : pages.getRecords()) {
 			if (ObjectUtils.isNotNull(item.getExtendedData())) {
@@ -195,12 +201,12 @@ public class BCorpsController extends BladeController {
 			.like(ObjectUtils.isNotNull(bCorps.getEnName()), BCorps::getEnName, bCorps.getEnName())
 			.like(ObjectUtils.isNotNull(bCorps.getShortName()), BCorps::getShortName, bCorps.getShortName())
 			.like(ObjectUtils.isNotNull(bCorps.getUscc()), BCorps::getUscc, bCorps.getUscc());
-		if (AuthUtil.getUserRole().contains("admin") || AuthUtil.getUserRole().contains("secondaryAdmin")) {
-			//管理员、次级管理员查看全部数据
+		if (!AuthUtil.getUserRole().contains("总部") && !AuthUtil.getUserRole().contains("admin")) {
+			lambdaQueryWrapper.apply("(find_in_set('" + AuthUtil.getDeptId() + "',branch_id) or branch_id is null)");
 		} else {
-			lambdaQueryWrapper.apply("find_in_set('" + deptUtils.getDeptPid() + "',branch_id)");
+			lambdaQueryWrapper.eq(ObjectUtils.isNotNull(bCorps.getBranchId()), BCorps::getBranchId, bCorps.getBranchId());
 		}
-		String status = sysClient.getParamServiceNew("basic.data.sort");
+		String status = sysClient.getParamService("basic.data.sort");
 		if ("name".equals(status)) {
 			lambdaQueryWrapper.orderByDesc(BCorps::getCnName);
 		} else if ("letter".equals(status)) {
@@ -383,12 +389,12 @@ public class BCorpsController extends BladeController {
 			.like(ObjectUtils.isNotNull(bCorps.getAdminProfiles()), BCorps::getAdminProfiles, bCorps.getAdminProfiles())
 //			.apply(ObjectUtils.isNotNull(bCorps.getCorpType()), "find_in_set('" + bCorps.getCorpType() + "',corp_type)");
 			.apply(ObjectUtils.isNotNull(bCorps.getCorpTypeName()), "find_in_set('" + bCorps.getCorpTypeName() + "',corp_type_name)");
-		if (AuthUtil.getUserRole().contains("admin") || AuthUtil.getUserRole().contains("secondaryAdmin")) {
-			//管理员、次级管理员查看全部数据
+		if (!AuthUtil.getUserRole().contains("总部") && !AuthUtil.getUserRole().contains("admin")) {
+			lambdaQueryWrapper.apply("(find_in_set('" + AuthUtil.getDeptId() + "',branch_id) or branch_id is null)");
 		} else {
-			lambdaQueryWrapper.apply("find_in_set('" + deptUtils.getDeptPid() + "',branch_id)");
+			lambdaQueryWrapper.eq(ObjectUtils.isNotNull(bCorps.getBranchId()), BCorps::getBranchId, bCorps.getBranchId());
 		}
-		String status = sysClient.getParamServiceNew("basic.data.sort");
+		String status = sysClient.getParamService("basic.data.sort");
 		if ("name".equals(status)) {
 			lambdaQueryWrapper.orderByDesc(BCorps::getCnName);
 		} else if ("letter".equals(status)) {
@@ -460,7 +466,7 @@ public class BCorpsController extends BladeController {
 			.like(ObjectUtils.isNotNull(bCorps.getCorpSource()), BCorps::getCorpSource, bCorps.getCorpSource())
 			.like(ObjectUtils.isNotNull(bCorps.getTel()), BCorps::getTel, bCorps.getTel())
 			.like(ObjectUtils.isNotNull(bCorps.getAdminProfiles()), BCorps::getAdminProfiles, bCorps.getAdminProfiles());
-		String status = sysClient.getParamServiceNew("basic.data.sort");
+		String status = sysClient.getParamService("basic.data.sort");
 		if ("name".equals(status)) {
 			lambdaQueryWrapper.orderByDesc(BCorps::getCnName);
 		} else if ("letter".equals(status)) {
@@ -468,6 +474,11 @@ public class BCorpsController extends BladeController {
 		} else {
 			lambdaQueryWrapper.orderByDesc(BCorps::getCreateTime);
 		}
+		if (!AuthUtil.getUserRole().contains("总部") && !AuthUtil.getUserRole().contains("admin")) {
+			lambdaQueryWrapper.apply("(find_in_set('" + AuthUtil.getDeptId() + "',branch_id) or branch_id is null)");
+		} else {
+			lambdaQueryWrapper.eq(ObjectUtils.isNotNull(bCorps.getBranchId()), BCorps::getBranchId, bCorps.getBranchId());
+		}
 		List<BCorps> pages = bCorpsService.list(lambdaQueryWrapper);
 		for (BCorps item : pages) {
 			if (ObjectUtils.isNotNull(item.getExtendedData())) {

blade-service/blade-los/src/main/java/org/springblade/los/basic/corps/service/impl/BCorpsServiceImpl.java

@@ -92,17 +92,16 @@ public class BCorpsServiceImpl extends ServiceImpl<CorpsMapper, BCorps> implemen
 		BCorps bCorps = JSONObject.parseObject(JSONObject.toJSONString(object), BCorps.class);
 		String deptId ;
 		String deptName = "";
-		String branchId;
+		String branchId = null;
 		if (ObjectUtils.isNotNull(bCorps.getBranchId())){
 			deptId = bCorps.getBranchId();
 			branchId = bCorps.getBranchId();
 			deptName = bCorps.getBranchName();
 		}else{
 			deptId = AuthUtil.getDeptId();
-			branchId = AuthUtil.getDeptId();
 		}
 		//获取部门ids对应中文名
-		R<String> res = sysClient.getDeptName(Long.parseLong(branchId));
+		R<String> res = sysClient.getDeptName(Long.parseLong(deptId));
 		if (res.isSuccess() && ObjectUtils.isNotNull(res.getData())) {
 			deptName = res.getData();
 		}

blade-service/blade-los/src/main/java/org/springblade/los/basic/countrys/controller/BCountrysController.java

@@ -89,7 +89,7 @@ public class BCountrysController extends BladeController {
 			.like(ObjectUtils.isNotNull(bCountrys.getCnName()), BCountrys::getCnName, bCountrys.getCnName())
 			.like(ObjectUtils.isNotNull(bCountrys.getEnName()), BCountrys::getEnName, bCountrys.getEnName())
 			.like(ObjectUtils.isNotNull(bCountrys.getStatus()), BCountrys::getStatus, bCountrys.getStatus());
-		String status = sysClient.getParamServiceNew("basic.data.sort");
+		String status = sysClient.getParamService("basic.data.sort");
 		if ("name".equals(status)) {
 			lambdaQueryWrapper.orderByAsc(BCountrys::getCnName);
 		} else if ("letter".equals(status)) {
@@ -218,7 +218,7 @@ public class BCountrysController extends BladeController {
 			.like(ObjectUtils.isNotNull(bCountrys.getUnCode()), BCountrys::getUnCode, bCountrys.getUnCode())
 			.like(ObjectUtils.isNotNull(bCountrys.getCnName()), BCountrys::getCnName, bCountrys.getCnName())
 			.like(ObjectUtils.isNotNull(bCountrys.getEnName()), BCountrys::getEnName, bCountrys.getEnName());
-		String status = sysClient.getParamServiceNew("basic.data.sort");
+		String status = sysClient.getParamService("basic.data.sort");
 		if ("name".equals(status)) {
 			lambdaQueryWrapper.orderByDesc(BCountrys::getCnName);
 		} else if ("letter".equals(status)) {

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

@@ -75,13 +75,17 @@ public class BCurExrateController extends BladeController {
 		LambdaQueryWrapper<BCurExrate> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 		lambdaQueryWrapper.eq(BCurExrate::getTenantId, AuthUtil.getTenantId())
 			.eq(BCurExrate::getIsDeleted, 0)
-			.eq(BCurExrate::getBranchId, AuthUtil.getDeptId())
 			.eq(ObjectUtils.isNotNull(bCurExrate.getCode()), BCurExrate::getCode, bCurExrate.getCode())
 			.eq(ObjectUtils.isNotNull(bCurExrate.getExrateYear()), BCurExrate::getExrateYear, bCurExrate.getExrateYear())
 			.eq(ObjectUtils.isNotNull(bCurExrate.getExrateMonth()), BCurExrate::getExrateMonth, bCurExrate.getExrateMonth())
 			.eq(ObjectUtils.isNotNull(bCurExrate.getExrateDay()), BCurExrate::getExrateDay, bCurExrate.getExrateDay())
 			.eq(ObjectUtils.isNotNull(bCurExrate.getType()), BCurExrate::getType, bCurExrate.getType())
 			.orderByAsc(BCurExrate::getExrateMonth);
+		if (!AuthUtil.getUserRole().contains("总部") && !AuthUtil.getUserRole().contains("admin")) {
+			lambdaQueryWrapper.eq(BCurExrate::getBranchId, AuthUtil.getDeptId());
+		} else {
+			lambdaQueryWrapper.eq(ObjectUtils.isNotNull(bCurExrate.getBranchId()), BCurExrate::getBranchId, bCurExrate.getBranchId());
+		}
 		IPage<BCurExrate> pages = bCurExrateService.page(Condition.getPage(query), lambdaQueryWrapper);
 		return R.data(pages);
 	}

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

@@ -113,8 +113,27 @@ public class BCurrencyController extends BladeController {
 	@GetMapping("/page")
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "分页", notes = "传入bCurrency")
-	public R<IPage<BCurrencyVO>> page(BCurrencyVO bCurrency, Query query) {
-		IPage<BCurrencyVO> pages = bCurrencyService.selectBCurrencyPage(Condition.getPage(query), bCurrency);
+	public R<IPage<BCurrency>> page(BCurrencyVO bCurrency, Query query) {
+		LambdaQueryWrapper<BCurrency> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+		lambdaQueryWrapper.eq(BCurrency::getTenantId, AuthUtil.getTenantId())
+			.eq(BCurrency::getIsDeleted, 0)
+			.eq(BCurrency::getBranchId, AuthUtil.getDeptId())
+			.like(ObjectUtils.isNotNull(bCurrency.getCode()), BCurrency::getCode, bCurrency.getCode())
+			.like(ObjectUtils.isNotNull(bCurrency.getUnCode()), BCurrency::getUnCode, bCurrency.getUnCode())
+			.like(ObjectUtils.isNotNull(bCurrency.getCnName()), BCurrency::getCnName, bCurrency.getCnName())
+			.like(ObjectUtils.isNotNull(bCurrency.getEnName()), BCurrency::getEnName, bCurrency.getEnName())
+			.like(ObjectUtils.isNotNull(bCurrency.getSymbol()), BCurrency::getSymbol, bCurrency.getSymbol())
+			.like(ObjectUtils.isNotNull(bCurrency.getCntyCode()), BCurrency::getCntyCode, bCurrency.getCntyCode())
+			.like(ObjectUtils.isNotNull(bCurrency.getCntyName()), BCurrency::getCntyName, bCurrency.getCntyName())
+			.eq(ObjectUtils.isNotNull(bCurrency.getIsLocal()), BCurrency::getIsLocal, bCurrency.getIsLocal())
+			.eq(ObjectUtils.isNotNull(bCurrency.getStatus()), BCurrency::getStatus, bCurrency.getStatus())
+			.orderByDesc(BCurrency::getCreateTime);
+		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());
+		}
+		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

@@ -68,10 +68,18 @@ public class BCurrencyServiceImpl extends ServiceImpl<CurrencyMapper, BCurrency>
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public R submit(BCurrency bCurrency) {
-		String deptId = AuthUtil.getDeptId();
+		String deptId;
+		String branchId;
 		String deptName = "";
+		if (ObjectUtils.isNull(bCurrency.getBranchId())) {
+			deptId = AuthUtil.getDeptId();
+			branchId = AuthUtil.getDeptId();
+		} else {
+			deptId = bCurrency.getBranchId();
+			branchId = bCurrency.getBranchId();
+		}
 		//获取部门ids对应中文名
-		R<String> res = sysClient.getDeptName(Long.parseLong(deptId));
+		R<String> res = sysClient.getDeptName(Long.parseLong(branchId));
 		if (res.isSuccess() && ObjectUtils.isNotNull(res.getData())) {
 			deptName = res.getData();
 		}
@@ -93,14 +101,14 @@ public class BCurrencyServiceImpl extends ServiceImpl<CurrencyMapper, BCurrency>
 			if (!currencyList.isEmpty()) {
 				throw new RuntimeException("编码已存在");
 			}
-			if (!isLocalList.isEmpty()) {
-				throw new RuntimeException("只允许存在一个本位币");
-			}
 			bCurrency.setCreateDept(deptId);
 			bCurrency.setCreateDeptName(deptName);
 			bCurrency.setBranchId(deptId);
 			bCurrency.setBranchName(deptName);
 			if (1 == bCurrency.getIsLocal()){
+				if (!isLocalList.isEmpty()) {
+					throw new RuntimeException("只允许存在一个本位币");
+				}
 				BCurExrate bCurExrate = new BCurExrate();
 				bCurExrate.setCreateTime(new Date());
 				bCurExrate.setCreateUser(AuthUtil.getUserId());
@@ -122,44 +130,46 @@ public class BCurrencyServiceImpl extends ServiceImpl<CurrencyMapper, BCurrency>
 			if (currencyList.stream().anyMatch(e -> !e.getId().equals(bCurrency.getId()))) {
 				throw new RuntimeException("编码已存在");
 			}
-			if (isLocalList.stream().anyMatch(e -> !e.getId().equals(bCurrency.getId()) && bCurrency.getIsLocal() == 1)) {
-				throw new RuntimeException("只允许存在一个本位币");
-			}
 			bCurrency.setUpdateUser(AuthUtil.getUserId());
 			bCurrency.setUpdateTime(new Date());
 			bCurrency.setUpdateUserName(AuthUtil.getUserName());
-			BCurExrate bCurExrate = bCurExrateService.getOne(new LambdaQueryWrapper<BCurExrate>()
-				.eq(BCurExrate::getTenantId,AuthUtil.getTenantId())
-				.eq(BCurExrate::getBranchId,bCurrency.getBranchId())
-				.eq(BCurExrate::getCode,bCurrency.getCode()));
-			if (bCurExrate != null){
-				bCurExrate.setUpdateUser(AuthUtil.getUserId());
-				bCurExrate.setUpdateUserName(AuthUtil.getUserName());
-				bCurExrate.setUpdateTime(new Date());
-				bCurExrate.setCnName(bCurrency.getCnName());
-				bCurExrate.setEnName(bCurrency.getEnName());
-				bCurExrate.setExrateReceivable(bCurrency.getExrate());
-				bCurExrate.setExratePayable(bCurrency.getExrate());
-				bCurExrate.setExrateReceipts(bCurrency.getExrate());
-				bCurExrate.setExratePayment(bCurrency.getExrate());
-			}else{
-				bCurExrate = new BCurExrate();
-				bCurExrate.setCreateTime(new Date());
-				bCurExrate.setCreateUser(AuthUtil.getUserId());
-				bCurExrate.setCreateUserName(AuthUtil.getUserName());
-				bCurExrate.setCreateDept(deptId);
-				bCurExrate.setCreateDeptName(deptName);
-				bCurExrate.setBranchId(deptId);
-				bCurExrate.setBranchName(deptName);
-				bCurExrate.setCode(bCurrency.getCode());
-				bCurExrate.setCnName(bCurrency.getCnName());
-				bCurExrate.setEnName(bCurrency.getEnName());
-				bCurExrate.setExrateReceivable(bCurrency.getExrate());
-				bCurExrate.setExratePayable(bCurrency.getExrate());
-				bCurExrate.setExrateReceipts(bCurrency.getExrate());
-				bCurExrate.setExratePayment(bCurrency.getExrate());
+			if (1 == bCurrency.getIsLocal()){
+				if (isLocalList.stream().anyMatch(e -> !e.getId().equals(bCurrency.getId()))) {
+					throw new RuntimeException("只允许存在一个本位币");
+				}
+				BCurExrate bCurExrate = bCurExrateService.getOne(new LambdaQueryWrapper<BCurExrate>()
+					.eq(BCurExrate::getTenantId,AuthUtil.getTenantId())
+					.eq(BCurExrate::getBranchId,bCurrency.getBranchId())
+					.eq(BCurExrate::getCode,bCurrency.getCode()));
+				if (bCurExrate != null){
+					bCurExrate.setUpdateUser(AuthUtil.getUserId());
+					bCurExrate.setUpdateUserName(AuthUtil.getUserName());
+					bCurExrate.setUpdateTime(new Date());
+					bCurExrate.setCnName(bCurrency.getCnName());
+					bCurExrate.setEnName(bCurrency.getEnName());
+					bCurExrate.setExrateReceivable(bCurrency.getExrate());
+					bCurExrate.setExratePayable(bCurrency.getExrate());
+					bCurExrate.setExrateReceipts(bCurrency.getExrate());
+					bCurExrate.setExratePayment(bCurrency.getExrate());
+				}else{
+					bCurExrate = new BCurExrate();
+					bCurExrate.setCreateTime(new Date());
+					bCurExrate.setCreateUser(AuthUtil.getUserId());
+					bCurExrate.setCreateUserName(AuthUtil.getUserName());
+					bCurExrate.setCreateDept(deptId);
+					bCurExrate.setCreateDeptName(deptName);
+					bCurExrate.setBranchId(deptId);
+					bCurExrate.setBranchName(deptName);
+					bCurExrate.setCode(bCurrency.getCode());
+					bCurExrate.setCnName(bCurrency.getCnName());
+					bCurExrate.setEnName(bCurrency.getEnName());
+					bCurExrate.setExrateReceivable(bCurrency.getExrate());
+					bCurExrate.setExratePayable(bCurrency.getExrate());
+					bCurExrate.setExrateReceipts(bCurrency.getExrate());
+					bCurExrate.setExratePayment(bCurrency.getExrate());
+				}
+				bCurExrateService.saveOrUpdate(bCurExrate);
 			}
-			bCurExrateService.saveOrUpdate(bCurExrate);
 		}
 		this.saveOrUpdate(bCurrency);
 		if (ObjectUtils.isNotNull(bCurrency.getCurExrateList())) {
@@ -170,9 +180,10 @@ public class BCurrencyServiceImpl extends ServiceImpl<CurrencyMapper, BCurrency>
 					item.setType(bCurrency.getParitiesType());
 				}
 				item.setCode(bCurrency.getCode());
-				if (1 == bCurrency.getIsLocal()) {
+				if (0 == bCurrency.getIsLocal()) {
 					LambdaQueryWrapper<BCurExrate> lambdaQueryWrapper = new LambdaQueryWrapper<BCurExrate>()
 						.eq(BCurExrate::getType, item.getType())
+						.eq(BCurExrate::getBranchId, bCurrency.getBranchId())
 						.eq(BCurExrate::getCode, item.getCode()).eq(BCurExrate::getExrateYear, item.getExrateYear())
 						.eq(ObjectUtils.isNotNull(item.getExrateMonth()), BCurExrate::getExrateMonth, item.getExrateMonth())
 						.eq(ObjectUtils.isNotNull(item.getExrateDay()), BCurExrate::getExrateDay, item.getExrateDay());
@@ -278,7 +289,7 @@ public class BCurrencyServiceImpl extends ServiceImpl<CurrencyMapper, BCurrency>
 				.eq(BCurExrate::getIsDeleted, 0)
 				.eq(BCurExrate::getExrateYear, year);
 			if ("1".equals(type)) {
-				String status = sysClient.getParamServiceNew("business.exchange.rate");
+				String status = sysClient.getParamService("business.exchange.rate");
 				if (ObjectUtils.isNotNull(status)) {
 					if ("月".equals(status)) {
 						lambdaQueryWrapper.eq(BCurExrate::getExrateMonth, month)
@@ -428,7 +439,7 @@ public class BCurrencyServiceImpl extends ServiceImpl<CurrencyMapper, BCurrency>
 				.eq(BCurExrate::getIsDeleted, 0)
 				.eq(BCurExrate::getExrateYear, year);
 			if ("1".equals(type)) {
-				String status = sysClient.getParamServiceNew("business.exchange.rate");
+				String status = sysClient.getParamService("business.exchange.rate");
 				if (ObjectUtils.isNotNull(status)) {
 					if ("月".equals(status)) {
 						lambdaQueryWrapper.eq(BCurExrate::getExrateMonth, month)
@@ -536,7 +547,7 @@ public class BCurrencyServiceImpl extends ServiceImpl<CurrencyMapper, BCurrency>
 				.eq(BCurExrate::getIsDeleted, 0)
 				.eq(BCurExrate::getExrateYear, year);
 			if ("1".equals(type)) {
-				String status = sysClient.getParamServiceNew("business.exchange.rate");
+				String status = sysClient.getParamService("business.exchange.rate");
 				if (ObjectUtils.isNotNull(status)) {
 					if ("月".equals(status)) {
 						lambdaQueryWrapper.eq(BCurExrate::getExrateMonth, month)

blade-service/blade-los/src/main/java/org/springblade/los/basic/fees/controller/BFeesController.java

@@ -93,7 +93,7 @@ public class BFeesController extends BladeController {
 			.like(ObjectUtils.isNotNull(bFees.getCode()), BFees::getCode, bFees.getCode())
 			.like(ObjectUtils.isNotNull(bFees.getEnName()), BFees::getEnName, bFees.getEnName())
 			.like(ObjectUtils.isNotNull(bFees.getFeesTypeId()), BFees::getFeesTypeId, bFees.getFeesTypeId());
-		String status = sysClient.getParamServiceNew("basic.data.sort");
+		String status = sysClient.getParamService("basic.data.sort");
 		if ("name".equals(status)) {
 			lambdaQueryWrapper.orderByAsc(BFees::getCnName);
 		} else if ("letter".equals(status)) {
@@ -222,7 +222,7 @@ public class BFeesController extends BladeController {
 			.like(ObjectUtils.isNotNull(bFees.getCode()), BFees::getCode, bFees.getCode())
 			.like(ObjectUtils.isNotNull(bFees.getEnName()), BFees::getEnName, bFees.getEnName())
 			.like(ObjectUtils.isNotNull(bFees.getFeesTypeId()), BFees::getFeesTypeId, bFees.getFeesTypeId());
-		String status = sysClient.getParamServiceNew("basic.data.sort");
+		String status = sysClient.getParamService("basic.data.sort");
 		if ("name".equals(status)) {
 			lambdaQueryWrapper.orderByDesc(BFees::getCnName);
 		} else if ("letter".equals(status)) {

blade-service/blade-los/src/main/java/org/springblade/los/basic/lines/controller/BLinesController.java

@@ -107,7 +107,7 @@ public class BLinesController extends BladeController {
 			.like(ObjectUtils.isNotNull(bLines.getCnName()), BLines::getCnName, bLines.getCnName())
 			.like(ObjectUtils.isNotNull(bLines.getEnName()), BLines::getEnName, bLines.getEnName())
 			.like(ObjectUtils.isNotNull(bLines.getStatus()), BLines::getStatus, bLines.getStatus());
-		String status = sysClient.getParamServiceNew("basic.data.sort");
+		String status = sysClient.getParamService("basic.data.sort");
 		if ("name".equals(status)) {
 			lambdaQueryWrapper.orderByAsc(BLines::getCnName);
 		} else if ("letter".equals(status)) {

blade-service/blade-los/src/main/java/org/springblade/los/basic/locations/controller/BLocationsController.java

@@ -93,7 +93,7 @@ public class BLocationsController extends BladeController {
 			.like(ObjectUtils.isNotNull(bLocations.getStateName()), BLocations::getStateName, bLocations.getStateName())
 			.like(ObjectUtils.isNotNull(bLocations.getEnName()), BLocations::getEnName, bLocations.getEnName())
 			.like(ObjectUtils.isNotNull(bLocations.getStatus()), BLocations::getStatus, bLocations.getStatus());
-		String status = sysClient.getParamServiceNew("basic.data.sort");
+		String status = sysClient.getParamService("basic.data.sort");
 		if ("name".equals(status)) {
 			lambdaQueryWrapper.orderByAsc(BLocations::getCnName);
 		} else if ("letter".equals(status)) {

blade-service/blade-los/src/main/java/org/springblade/los/basic/modes/controller/BTradeModesController.java

@@ -89,7 +89,7 @@ public class BTradeModesController extends BladeController {
 			.like(ObjectUtils.isNotNull(bTradeModes.getCnName()), BTradeModes::getCnName, bTradeModes.getCnName())
 			.like(ObjectUtils.isNotNull(bTradeModes.getEnName()), BTradeModes::getEnName, bTradeModes.getEnName())
 			.like(ObjectUtils.isNotNull(bTradeModes.getStatus()), BTradeModes::getStatus, bTradeModes.getStatus());
-		String status = sysClient.getParamServiceNew("basic.data.sort");
+		String status = sysClient.getParamService("basic.data.sort");
 		if ("name".equals(status)) {
 			lambdaQueryWrapper.orderByAsc(BTradeModes::getCnName);
 		} else if ("letter".equals(status)) {

blade-service/blade-los/src/main/java/org/springblade/los/basic/packages/controller/BPackagesController.java

@@ -103,7 +103,7 @@ public class BPackagesController extends BladeController {
 			.like(ObjectUtils.isNotNull(bPackages.getEnName()), BPackages::getEnName, bPackages.getEnName())
 			.eq(ObjectUtils.isNotNull(bPackages.getWhetherDg()), BPackages::getWhetherDg, bPackages.getWhetherDg())
 			.like(ObjectUtils.isNotNull(bPackages.getStatus()), BPackages::getStatus, bPackages.getStatus());
-		String status = sysClient.getParamServiceNew("basic.data.sort");
+		String status = sysClient.getParamService("basic.data.sort");
 		if ("name".equals(status)) {
 			lambdaQueryWrapper.orderByAsc(BPackages::getCnName);
 		} else if ("letter".equals(status)) {

blade-service/blade-los/src/main/java/org/springblade/los/basic/ports/controller/BPortsController.java

@@ -104,7 +104,7 @@ public class BPortsController extends BladeController {
 				.like(BPorts::getCnName, bPorts.getEnName()).or()
 				.like(BPorts::getEnName, bPorts.getEnName()))
 			.like(ObjectUtils.isNotNull(bPorts.getStatus()), BPorts::getStatus, bPorts.getStatus());
-		String status = sysClient.getParamServiceNew("basic.data.sort");
+		String status = sysClient.getParamService("basic.data.sort");
 		if ("name".equals(status)) {
 			lambdaQueryWrapper.orderByAsc(BPorts::getCnName);
 		} else if ("letter".equals(status)) {
@@ -247,7 +247,7 @@ public class BPortsController extends BladeController {
 				.like(BPorts::getCnName, bPorts.getEnName()).or()
 				.like(BPorts::getEnName, bPorts.getEnName()))
 			.like(ObjectUtils.isNotNull(bPorts.getStatus()), BPorts::getStatus, bPorts.getStatus());
-		String status = sysClient.getParamServiceNew("basic.data.sort");
+		String status = sysClient.getParamService("basic.data.sort");
 		if ("name".equals(status)) {
 			lambdaQueryWrapper.orderByAsc(BPorts::getCnName);
 		} else if ("letter".equals(status)) {

blade-service/blade-los/src/main/java/org/springblade/los/basic/reports/service/impl/ReportsBoxServiceImpl.java

@@ -76,7 +76,7 @@ public class ReportsBoxServiceImpl implements IReportsBoxService {
 		Dept dept;
 		if (res.isSuccess() && res.getData() != null) {
 			dept = res.getData();
-			String status = sysClient.getParamServiceNew("is.update.default");
+			String status = sysClient.getParamService("is.update.default");
 			if ("1".equals(status)) {
 				R<User> resUser = userClient.userInfoById(AuthUtil.getUserId());
 				if (resUser.isSuccess() && resUser.getData() != null) {

blade-service/blade-los/src/main/java/org/springblade/los/basic/reports/service/impl/ReportsServiceImpl.java

@@ -168,7 +168,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 		Dept dept;
 		if (res.isSuccess() && res.getData() != null) {
 			dept = res.getData();
-			String status = sysClient.getParamServiceNew("is.update.default");
+			String status = sysClient.getParamService("is.update.default");
 			if ("1".equals(status)) {
 				R<User> resUser = userClient.userInfoById(AuthUtil.getUserId());
 				if (resUser.isSuccess() && resUser.getData() != null) {
@@ -189,6 +189,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 				FinStlBills finStlBills = finStlBillsService.getById(billId);
 				if (finStlBills != null) {
 					String exrateType = currencyUtils.standardCurrency(finStlBills.getBranchId());
+					finStlBills.setExrateType(exrateType);
 					finStlBills.setBankAccountBank(finStlBills.getBankAccountBank() + "/" + finStlBills.getBankAccountNo());
 					if (agreementPriceService.count(new LambdaQueryWrapper<AgreementPrice>()
 						.eq(AgreementPrice::getTenantId, AuthUtil.getTenantId())
@@ -358,6 +359,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 				FinStlBills finStlBills = finStlBillsService.getById(billId);
 				if (finStlBills != null) {
 					String exrateType = currencyUtils.standardCurrency(finStlBills.getBranchId());
+					finStlBills.setExrateType(exrateType);
 					if (ObjectUtils.isNotNull(finStlBills.getCorpId())) {
 						BCorps bCorps = bCorpsService.getById(finStlBills.getCorpId());
 						if (bCorps != null) {
@@ -426,6 +428,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 				FinStlBills finStlBills = finStlBillsService.getById(billId);
 				if (finStlBills != null) {
 					String exrateType = currencyUtils.standardCurrency(finStlBills.getBranchId());
+					finStlBills.setExrateType(exrateType);
 					if (ObjectUtils.isNotNull(finStlBills.getCorpId())) {
 						BCorps bCorps = bCorpsService.getById(finStlBills.getCorpId());
 						if (bCorps != null) {
@@ -495,6 +498,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 				FinStlBills finStlBills = finStlBillsService.getById(billId);
 				if (finStlBills != null) {
 					String exrateType = currencyUtils.standardCurrency(finStlBills.getBranchId());
+					finStlBills.setExrateType(exrateType);
 					if (ObjectUtils.isNotNull(finStlBills.getCorpId())) {
 						BCorps bCorps = bCorpsService.getById(finStlBills.getCorpId());
 						if (bCorps != null) {
@@ -563,6 +567,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 				FinInvoices finStlBills = finInvoicesService.getById(billId);
 				if (finStlBills != null) {
 					String exrateType = currencyUtils.standardCurrency(finStlBills.getBranchId());
+					finStlBills.setExrateType(exrateType);
 					if (ObjectUtils.isNotNull(finStlBills.getCorpId())) {
 						BCorps bCorps = bCorpsService.getById(finStlBills.getCorpId());
 						if (bCorps != null) {
@@ -630,6 +635,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 				FinInvoices finStlBills = finInvoicesService.getById(billId);
 				if (finStlBills != null) {
 					String exrateType = currencyUtils.standardCurrency(finStlBills.getBranchId());
+					finStlBills.setExrateType(exrateType);
 					if (ObjectUtils.isNotNull(finStlBills.getCorpId())) {
 						BCorps bCorps = bCorpsService.getById(finStlBills.getCorpId());
 						if (bCorps != null) {
@@ -708,7 +714,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 		Dept dept;
 		if (res.isSuccess() && res.getData() != null) {
 			dept = res.getData();
-			String status = sysClient.getParamServiceNew("is.update.default");
+			String status = sysClient.getParamService("is.update.default");
 			if ("1".equals(status)) {
 				R<User> resUser = userClient.userInfoById(AuthUtil.getUserId());
 				if (resUser.isSuccess() && resUser.getData() != null) {
@@ -723,10 +729,11 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 		// 销售报告 SALES REPORT
 		if (MagicValues.BUSINESS.equals(reportCode) && MagicValues.SALES_REPORT.equals(groupCode) && (MagicValues.HYCK.equals(type) || MagicValues.HYJK.equals(type))) {
 			List<Bills> list = new ArrayList<>();
-			// String profitMargin = sysClient.getParamServiceNew(MagicValues.PROFIT_MARGIN);
+			// String profitMargin = sysClient.getParamService(MagicValues.PROFIT_MARGIN);
 			Bills bills = billsService.getById(billId);
 			if (bills != null) {
 				String exrateType = currencyUtils.standardCurrency(bills.getBranchId());
+				bills.setExrateType(exrateType);
 				this.dictionaryConversion(bills);
 				this.assignmentSeaBillsDetail(bills);
 				HmmEdi hmmEdi = hmmEdiService.getOne(new LambdaQueryWrapper<HmmEdi>()
@@ -1192,6 +1199,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 			Bills bills = billsService.getById(billId);
 			if (bills != null) {
 				String exrateType = currencyUtils.standardCurrency(bills.getBranchId());
+				bills.setExrateType(exrateType);
 				this.dictionaryConversion(bills);
 				this.assignmentSeaBillsDetail(bills);
 //				bills.setFM(MagicValues.FM);
@@ -1251,6 +1259,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 			Bills bills = billsService.getById(billId);
 			if (bills != null) {
 				String exrateType = currencyUtils.standardCurrency(bills.getBranchId());
+				bills.setExrateType(exrateType);
 				this.dictionaryConversion(bills);
 //				bills.setFM(MagicValues.FM);
 				bills.setCapitalLetters("SAY " + BigDecimalUtils.convertToEnglish(bills.getQuantity()) + " " + bills.getPackingUnit() + " ONLY.");
@@ -1297,6 +1306,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 			Bills bills = billsService.getById(billId);
 			if (bills != null) {
 				String exrateType = currencyUtils.standardCurrency(bills.getBranchId());
+				bills.setExrateType(exrateType);
 				this.dictionaryConversion(bills);
 				this.assignmentSeaBillsDetail(bills);
 //				bills.setFM(MagicValues.FM);
@@ -1320,6 +1330,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 			Bills bills = billsService.getById(billId);
 			if (bills != null) {
 				String exrateType = currencyUtils.standardCurrency(bills.getBranchId());
+				bills.setExrateType(exrateType);
 				this.dictionaryConversion(bills);
 				this.assignmentSeaBillsDetail(bills);
 //				bills.setFM(MagicValues.FM);
@@ -1335,6 +1346,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 			Bills bills = billsService.getById(billId);
 			if (bills != null) {
 				String exrateType = currencyUtils.standardCurrency(bills.getBranchId());
+				bills.setExrateType(exrateType);
 				Date date;
 				if ("SE".equals(bills.getBusinessType())) {
 					date = bills.getEtd();
@@ -1400,6 +1412,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 			Bills bills = billsService.getById(billId);
 			if (bills != null) {
 				String exrateType = currencyUtils.standardCurrency(bills.getBranchId());
+				bills.setExrateType(exrateType);
 				Date date;
 				if ("SE".equals(bills.getBusinessType())) {
 					date = bills.getEtd();
@@ -1453,6 +1466,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 			Bills bills = billsService.getById(billId);
 			if (bills != null) {
 				String exrateType = currencyUtils.standardCurrency(bills.getBranchId());
+				bills.setExrateType(exrateType);
 				this.dictionaryConversion(bills);
 				this.assignmentSeaBillsDetail(bills);
 				HmmEdi hmmEdi = hmmEdiService.getOne(new LambdaQueryWrapper<HmmEdi>()
@@ -1941,6 +1955,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 			Bills bills = billsService.getById(billId);
 			if (bills != null) {
 				String exrateType = currencyUtils.standardCurrency(bills.getBranchId());
+				bills.setExrateType(exrateType);
 				this.dictionaryConversion(bills);
 				this.assignmentSeaBillsDetail(bills);
 //				bills.setFM(MagicValues.FM);
@@ -2176,7 +2191,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 		Dept dept;
 		if (res.isSuccess() && res.getData() != null) {
 			dept = res.getData();
-			String status = sysClient.getParamServiceNew("is.update.default");
+			String status = sysClient.getParamService("is.update.default");
 			if ("1".equals(status)) {
 				R<User> resUser = userClient.userInfoById(AuthUtil.getUserId());
 				if (resUser.isSuccess() && resUser.getData() != null) {
@@ -2234,6 +2249,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 				List<BCurExrate> curExrateList = currencyUtils.obtainRate(date, "1", amends.getBranchId());
 				this.assignmentDc(bills, feeCenterList, curCode, exrateType, curExrateList);
 				bills.setDept(dept);
+				bills.setExrateType(exrateType);
 				map.put(MagicValues.DATA, bills);
 			} else {
 				map.put(MagicValues.DATA, null);
@@ -2284,6 +2300,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 				List<BCurExrate> curExrateList = currencyUtils.obtainRate(date, "1", amends.getBranchId());
 				this.assignmentDc(bills, feeCenterList, curCode, exrateType, curExrateList);
 				bills.setDept(dept);
+				bills.setExrateType(exrateType);
 				map.put(MagicValues.DATA, bills);
 			} else {
 				map.put(MagicValues.DATA, null);
@@ -3138,6 +3155,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 								item.setGrossMargin(new BigDecimal(MagicValues.ZERO));
 							}
 							item.setDept(dept);
+							item.setExrateType(exrateType);
 							item.setFeeCenterList(feeCenterReports);
 						}
 					}

blade-service/blade-los/src/main/java/org/springblade/los/basic/terms/controller/BServiceTermsController.java

@@ -103,7 +103,7 @@ public class BServiceTermsController extends BladeController {
 			.like(ObjectUtils.isNotNull(bServiceTerms.getCnName()), BServiceTerms::getCnName, bServiceTerms.getCnName())
 			.like(ObjectUtils.isNotNull(bServiceTerms.getEnName()), BServiceTerms::getEnName, bServiceTerms.getEnName())
 			.like(ObjectUtils.isNotNull(bServiceTerms.getStatus()), BServiceTerms::getStatus, bServiceTerms.getStatus());
-		String status = sysClient.getParamServiceNew("basic.data.sort");
+		String status = sysClient.getParamService("basic.data.sort");
 		if ("name".equals(status)) {
 			lambdaQueryWrapper.orderByAsc(BServiceTerms::getCnName);
 		} else if ("letter".equals(status)) {

blade-service/blade-los/src/main/java/org/springblade/los/basic/units/controller/BUnitsController.java

@@ -91,7 +91,7 @@ public class BUnitsController extends BladeController {
 			.like(ObjectUtils.isNotNull(bUnits.getCodeSw()), BUnits::getCodeSw, bUnits.getCodeSw())
 			.like(ObjectUtils.isNotNull(bUnits.getStatus()), BUnits::getStatus, bUnits.getStatus())
 			.like(ObjectUtils.isNotNull(bUnits.getQuantityRule()), BUnits::getQuantityRule, bUnits.getQuantityRule());
-		String status = sysClient.getParamServiceNew("basic.data.sort");
+		String status = sysClient.getParamService("basic.data.sort");
 		if ("name".equals(status)) {
 			lambdaQueryWrapper.orderByAsc(BUnits::getCnName);
 		} else if ("letter".equals(status)) {
@@ -230,7 +230,7 @@ public class BUnitsController extends BladeController {
 			.like(ObjectUtils.isNotNull(bUnits.getCodeSw()), BUnits::getCodeSw, bUnits.getCodeSw())
 			.like(ObjectUtils.isNotNull(bUnits.getStatus()), BUnits::getStatus, bUnits.getStatus())
 			.like(ObjectUtils.isNotNull(bUnits.getQuantityRule()), BUnits::getQuantityRule, bUnits.getQuantityRule());
-		String status = sysClient.getParamServiceNew("basic.data.sort");
+		String status = sysClient.getParamService("basic.data.sort");
 		if ("name".equals(status)) {
 			lambdaQueryWrapper.orderByAsc(BUnits::getCnName);
 		} else if ("letter".equals(status)) {

blade-service/blade-los/src/main/java/org/springblade/los/basic/vessels/controller/BVesselsController.java

@@ -116,7 +116,7 @@ public class BVesselsController extends BladeController {
 			.eq(ObjectUtils.isNotNull(bVessels.getCarrierId()), BVessels::getCarrierId, bVessels.getCarrierId())
 			.like(ObjectUtils.isNotNull(bVessels.getEnName()), BVessels::getEnName, bVessels.getEnName())
 			.like(ObjectUtils.isNotNull(bVessels.getStatus()), BVessels::getStatus, bVessels.getStatus());
-		String status = sysClient.getParamServiceNew("basic.data.sort");
+		String status = sysClient.getParamService("basic.data.sort");
 		if ("name".equals(status)) {
 			lambdaQueryWrapper.orderByAsc(BVessels::getCnName);
 		} else if ("letter".equals(status)) {

blade-service/blade-los/src/main/java/org/springblade/los/box/controller/ExpenseApplicationController.java

@@ -31,6 +31,7 @@ import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.los.business.sea.entity.Bills;
+import org.springblade.los.finance.stl.entity.FinStlBills;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.los.box.entity.ExpenseApplication;
@@ -84,6 +85,11 @@ public class ExpenseApplicationController extends BladeController {
 			lambdaQueryWrapper.ge(ExpenseApplication::getSrcBusDate, expenseApplication.getSrcBusDateList().get(0));
 			lambdaQueryWrapper.le(ExpenseApplication::getSrcBusDate, expenseApplication.getSrcBusDateList().get(1));
 		}
+		if (!AuthUtil.getUserRole().contains("总部") && !AuthUtil.getUserRole().contains("admin")) {
+			lambdaQueryWrapper.eq( ExpenseApplication::getBranchId, AuthUtil.getDeptId());
+		} else {
+			lambdaQueryWrapper.eq(ObjectUtils.isNotNull(expenseApplication.getBranchId()), ExpenseApplication::getBranchId, expenseApplication.getBranchId());
+		}
 		IPage<ExpenseApplication> pages = expenseApplicationService.page(Condition.getPage(query), lambdaQueryWrapper);
 		return R.data(pages);
 	}

blade-service/blade-los/src/main/java/org/springblade/los/box/service/impl/ExpenseApplicationServiceImpl.java

@@ -41,7 +41,6 @@ import org.springblade.los.check.service.IAuditPathsLevelsService;
 import org.springblade.los.check.service.IAuditProecessService;
 import org.springblade.los.finance.fee.entity.FeeCenter;
 import org.springblade.los.finance.fee.service.IFeeCenterService;
-import org.springblade.system.entity.Dept;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -169,7 +168,8 @@ public class ExpenseApplicationServiceImpl extends ServiceImpl<ExpenseApplicatio
 			expenseApplication.setCorpId(tradingBox.getPurchaseCompanyId());
 			expenseApplication.setCorpCnName(tradingBox.getPurchaseCompanyName());
 			expenseApplication.setCorpEnName(tradingBox.getPurchaseCompanyName());
-		}else if ("HYJK,HYCK".contains(expenseApplication.getSrcType())) {
+			expenseApplication.setBranchId(AuthUtil.getDeptId());
+		} else if ("HYJK,HYCK".contains(expenseApplication.getSrcType())) {
 			Bills bills = billsService.getById(expenseApplication.getSrcId());
 			if (bills == null) {
 				throw new RuntimeException("未查到单据信息");
@@ -186,6 +186,8 @@ public class ExpenseApplicationServiceImpl extends ServiceImpl<ExpenseApplicatio
 			expenseApplication.setCorpId(bills.getCorpId());
 			expenseApplication.setCorpCnName(bills.getCorpCnName());
 			expenseApplication.setCorpEnName(bills.getCorpEnName());
+			expenseApplication.setBranchId(bills.getBranchId());
+			expenseApplication.setBranchName(bills.getBranchName());
 		} else {
 			throw new RuntimeException("类型错误，未查到单据");
 		}
@@ -216,14 +218,14 @@ public class ExpenseApplicationServiceImpl extends ServiceImpl<ExpenseApplicatio
 			.eq(LosAuditPathsActs::getIsEnable, 1)
 			.eq(LosAuditPathsActs::getFidStatus, "status")
 			.eq(LosAuditPathsActs::getTenantId, AuthUtil.getTenantId())
-			.eq(LosAuditPathsActs::getSalesCompanyId, deptUtils.getDeptPid())
+			.eq(LosAuditPathsActs::getSalesCompanyId, AuthUtil.getDeptId())
 			.eq(LosAuditPathsActs::getActId, actId);
 		pathsActs = auditPathsActsService.getOne(auditPathsActsLambdaQueryWrapper);
 		//获取审批信息
 		LosAuditPathsActs losAuditPathsActs = auditPathsActsService.getOne(new LambdaQueryWrapper<LosAuditPathsActs>()
 			.eq(LosAuditPathsActs::getActId, actId)
 			.eq(LosAuditPathsActs::getFidStatus, "status")
-			.eq(LosAuditPathsActs::getSalesCompanyId, deptUtils.getDeptPid())
+			.eq(LosAuditPathsActs::getSalesCompanyId, AuthUtil.getDeptId())
 			.eq(LosAuditPathsActs::getTenantId, AuthUtil.getTenantId()));
 		Long pathId = losAuditPathsActs.getPathId();
 		auditPathsLevels = auditPathsLevelsService.list(new LambdaQueryWrapper<LosAuditPathsLevels>()
@@ -275,11 +277,8 @@ public class ExpenseApplicationServiceImpl extends ServiceImpl<ExpenseApplicatio
 			auditProecessDTO.setReferenceNumber(expenseApplication.getSrcContainerNumber());
 			auditProecessDTO.setMorderNo(expenseApplication.getSrcMblno());
 			auditProecessDTO.setSrcBusType(expenseApplication.getSrcType());
-			Dept dept = deptUtils.getDept(AuthUtil.getDeptId());
-			if (dept != null) {
-				auditProecessDTO.setSalesCompanyId(dept.getId());
-				auditProecessDTO.setSalesCompanyName(dept.getDeptName());
-			}
+			auditProecessDTO.setSalesCompanyId(Long.parseLong(expenseApplication.getBranchId()));
+			auditProecessDTO.setSalesCompanyName(expenseApplication.getBranchName());
 			BigDecimal salesPrice = expenseApplication.getFeeCenterList().stream().filter(e -> e.getDc().equals("D"))
 				.map(FeeCenter::getAmount).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
 			BigDecimal costPrice = expenseApplication.getFeeCenterList().stream().filter(e -> e.getDc().equals("C"))

blade-service/blade-los/src/main/java/org/springblade/los/business/amends/controller/AmendsController.java

@@ -35,6 +35,7 @@ import org.springblade.los.Util.IDeptUtils;
 import org.springblade.los.business.amends.entity.Amends;
 import org.springblade.los.business.amends.service.IAmendsService;
 import org.springblade.los.business.amends.vo.AmendsVO;
+import org.springblade.los.business.sea.entity.Bills;
 import org.springblade.system.feign.ISysClient;
 import org.springframework.web.bind.annotation.*;
 
@@ -98,33 +99,21 @@ public class AmendsController extends BladeController {
 			.le(ObjectUtils.isNotNull(amends.getEtaEnd()), Amends::getEta, amends.getEtaEnd())
 			.eq(Amends::getIsDeleted, 0)
 			.orderByDesc(Amends::getCreateTime);
-		String jurisdiction = sysClient.getParamService("data.jurisdiction");
-		if ("1".equals(jurisdiction)) {
-			if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("老板")
-				&& !AuthUtil.getUserRole().contains("副总") && !AuthUtil.getUserRole().contains("财务")
-				&& !AuthUtil.getUserRole().contains("经理")) {
-				if (AuthUtil.getUserRole().contains("操作经理")) {
-					lambdaQueryWrapper.eq(Amends::getOperatorDept, AuthUtil.getDeptId());
+		if (!AuthUtil.getUserRole().contains("总部") && !AuthUtil.getUserRole().contains("admin")) {
+			lambdaQueryWrapper.eq(Amends::getBranchId, AuthUtil.getDeptId());
+			if (!AuthUtil.getUserRole().contains("secondaryAdmin")) {
+				if (AuthUtil.getUserRole().contains("业务员")) {
+					lambdaQueryWrapper.eq(Amends::getSrcId, AuthUtil.getUserId());
 				} else if (AuthUtil.getUserRole().contains("操作员")) {
 					lambdaQueryWrapper.eq(Amends::getOperatorId, AuthUtil.getUserId());
-				} else if (AuthUtil.getUserRole().contains("销售经理")) {
-					lambdaQueryWrapper.eq(Amends::getSrcDeptId, AuthUtil.getDeptId());
-				} else if (AuthUtil.getUserRole().contains("业务员")) {
-					lambdaQueryWrapper.eq(Amends::getSrcId, AuthUtil.getUserId());
+				} else if (AuthUtil.getUserRole().contains("客服")) {
+					lambdaQueryWrapper.eq(Amends::getCustomerServiceId, AuthUtil.getUserId());
 				} else {
 					lambdaQueryWrapper.eq(Amends::getCreateUser, AuthUtil.getUserId());
 				}
-				lambdaQueryWrapper.eq(Amends::getBranchId, deptUtils.getDeptPid());
-			}
-		}else if ("2".equals(jurisdiction)) {
-			//动态权限不做任何处理
-		}  else {
-			if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("财务")) {
-				lambdaQueryWrapper.apply("find_in_set(team_id,'" + AuthUtil.getPostId() + "')");
-			}
-			if (!AuthUtil.getUserRole().contains("admin")) {
-				lambdaQueryWrapper.eq(Amends::getBranchId, deptUtils.getDeptPid());
 			}
+		} else {
+			lambdaQueryWrapper.eq(ObjectUtils.isNotNull(amends.getBranchId()),Amends::getBranchId, amends.getBranchId());
 		}
 		IPage<Amends> pages = amendsService.page(Condition.getPage(query), lambdaQueryWrapper);
 		return R.data(pages);

blade-service/blade-los/src/main/java/org/springblade/los/business/amends/service/impl/AmendsServiceImpl.java

@@ -165,6 +165,7 @@ public class AmendsServiceImpl extends ServiceImpl<AmendsMapper, Amends> impleme
 			amends.setCreateUserName(AuthUtil.getUserName());
 			if (ObjectUtils.isNotNull(deptUtils.getDeptPid()+"")) {
 				amends.setBranchId(branchId);
+				amends.setBranchName(deptName);
 				amends.setCreateDept(deptId);
 				amends.setCreateDeptName(deptName);
 			}
@@ -243,7 +244,7 @@ public class AmendsServiceImpl extends ServiceImpl<AmendsMapper, Amends> impleme
 			.eq(LosAuditPathsActs::getIsEnable, 1)
 			.eq(LosAuditPathsActs::getFidStatus, "status")
 			.eq(LosAuditPathsActs::getTenantId, AuthUtil.getTenantId())
-			.eq(LosAuditPathsActs::getSalesCompanyId, deptUtils.getDeptPid()+"")
+			.eq(LosAuditPathsActs::getSalesCompanyId, declare.getBranchId())
 			.eq(LosAuditPathsActs::getActId, actId);
 		pathsActs = auditPathsActsService.getOne(auditPathsActsLambdaQueryWrapper);
 		//获取审批信息
@@ -299,8 +300,8 @@ public class AmendsServiceImpl extends ServiceImpl<AmendsMapper, Amends> impleme
 			auditProecessDTO.setBillTime(declare.getCreateTime());
 			auditProecessDTO.setTenantId(AuthUtil.getTenantId());
 			auditProecessDTO.setCorpId(declare.getCorpId());
-			auditProecessDTO.setSalesCompanyId(deptUtils.getDeptPid());
-			auditProecessDTO.setSalesCompanyName(declare.getCreateDeptName());
+			auditProecessDTO.setSalesCompanyId(Long.parseLong(declare.getBranchId()));
+			auditProecessDTO.setSalesCompanyName(declare.getBranchName());
 			List<FeeCenter> feeCenterList = feeCenterService.list(new LambdaQueryWrapper<FeeCenter>()
 				.eq(FeeCenter::getIsDeleted, 0)
 				.eq(FeeCenter::getTenantId, AuthUtil.getTenantId())

blade-service/blade-los/src/main/java/org/springblade/los/business/sea/mapper/BillsMapper.xml

@@ -337,13 +337,9 @@
         WHERE
         acc.is_deleted = '0'
         AND fee.is_deleted = '0'
-        <if test='acc.postId != null'>
-            and find_in_set(acc.team_id,#{acc.postId})
-        </if>
-        <if test='acc.branchId != null'>
-            and find_in_set(acc.branch_id,#{acc.branchId})
+        <if test='acc.branchId != null and acc.branchId != ""'>
+            and acc.branch_id = #{acc.branchId}
         </if>
-
         <if test='acc.type != null and acc.type != "" and acc.type == "1"'>
             <if test='acc.isChecked != null and acc.isChecked == "0"'>
                 and acc.is_checked in (0,1,2)

blade-service/blade-los/src/main/java/org/springblade/los/business/sea/service/impl/BillsServiceImpl.java

@@ -426,11 +426,11 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 		} else {
 			date = bills.getEta();
 		}
-		String exrateType = currencyUtils.standardCurrency(branchId);
-		List<BCurExrate> curExrateList = currencyUtils.obtainRate(date, "1",branchId);
 		//应付
 		int statusC = 0;
 		if (ObjectUtils.isNotNull(bills.getFeeCenterListC())) {
+			String exrateType = currencyUtils.standardCurrency(branchId);
+			List<BCurExrate> curExrateList = currencyUtils.obtainRate(date, "1", branchId);
 			statusC += 1;
 			for (FeeCenter item : bills.getFeeCenterListC()) {
 				item.setPid(bills.getId());
@@ -483,6 +483,8 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 		//应收
 		int statusD = 0;
 		if (ObjectUtils.isNotNull(bills.getFeeCenterListD())) {
+			String exrateType = currencyUtils.standardCurrency(branchId);
+			List<BCurExrate> curExrateList = currencyUtils.obtainRate(date, "1", branchId);
 			statusD += 1;
 			for (FeeCenter item : bills.getFeeCenterListD()) {
 				item.setPid(bills.getId());
@@ -549,6 +551,7 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 		BigDecimal measurement = bills.getMeasurement();
 		//主单应加上分单费用
 		if ("MM".equals(bills.getBillType()) && ObjectUtils.isNotNull(bills.getId())) {
+			bills.setMasterBillNo(bills.getBillNo());
 			//主单信息同步分单
 			List<Bills> details = this.synchronous(bills);
 			if (!details.isEmpty()) {
@@ -558,15 +561,20 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 				amountCrUsd = amountCrUsd.add(details.stream().map(Bills::getAmountCrUsd).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
 				amountDrLoc = amountDrLoc.add(details.stream().map(Bills::getAmountDrLoc).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
 				amountCrLoc = amountCrLoc.add(details.stream().map(Bills::getAmountCrLoc).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
+				quantity = quantity.add(details.stream().map(Bills::getQuantity).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
+				grossWeight = grossWeight.add(details.stream().map(Bills::getGrossWeight).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
+				measurement = measurement.add(details.stream().map(Bills::getMeasurement).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
 			}
 		} else if ("MH".equals(bills.getBillType()) && ObjectUtils.isNotNull(bills.getId())) {
 			Bills details = baseMapper.selectOne(new LambdaQueryWrapper<Bills>()
 				.select(Bills::getAmountDr, Bills::getAmountCr, Bills::getAmountProfit, Bills::getAmountDrUsd, Bills::getAmountCrUsd
 					, Bills::getAmountProfitUsd, Bills::getAmountDrLoc, Bills::getAmountCrLoc, Bills::getAmountProfitLoc
 					, Bills::getQuantity, Bills::getGrossWeight, Bills::getMeasurement)
-				.eq(Bills::getMasterId, bills.getMasterId()));
+				.eq(Bills::getId, bills.getMasterId()));
 			//重新计算主单合计
 			if (details != null) {
+				String exrateType = currencyUtils.standardCurrency(branchId);
+				List<BCurExrate> curExrateList = currencyUtils.obtainRate(date, "1", branchId);
 				BigDecimal amountDrM = new BigDecimal("0.00");
 				BigDecimal amountCrM = new BigDecimal("0.00");
 				BigDecimal amountProfitM;
@@ -576,6 +584,9 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 				BigDecimal amountDrLocM = new BigDecimal("0.00");
 				BigDecimal amountCrLocM = new BigDecimal("0.00");
 				BigDecimal amountProfitLocM;
+				BigDecimal quantityM = bills.getQuantity();
+				BigDecimal grossWeightM = bills.getGrossWeight();
+				BigDecimal measurementM = bills.getMeasurement();
 				List<FeeCenter> feeCenterList = feeCenterService.list(new LambdaQueryWrapper<FeeCenter>()
 					.select(FeeCenter::getCurCode, FeeCenter::getAmount, FeeCenter::getDc)
 					.eq(FeeCenter::getTenantId, AuthUtil.getTenantId())
@@ -610,6 +621,9 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 						amountCrUsdM = amountCrUsdM.add(billsLists.stream().map(Bills::getAmountCrUsd).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
 						amountDrLocM = amountDrLocM.add(billsLists.stream().map(Bills::getAmountDrLoc).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
 						amountCrLocM = amountCrLocM.add(billsLists.stream().map(Bills::getAmountCrLoc).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
+						quantityM = quantityM.add(billsLists.stream().map(Bills::getQuantity).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
+						grossWeightM = grossWeightM.add(billsLists.stream().map(Bills::getGrossWeight).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
+						measurementM = measurementM.add(billsLists.stream().map(Bills::getMeasurement).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
 					}
 				}
 				amountDrM = amountDrM.add(amountDr);
@@ -631,6 +645,9 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 				details.setAmountDrLoc(amountDrLocM);
 				details.setAmountCrLoc(amountCrLocM);
 				details.setAmountProfitLoc(amountProfitLocM);
+				details.setQuantity(quantityM);
+				details.setGrossWeight(grossWeightM);
+				details.setMeasurement(measurementM);
 				this.updateById(details);
 			}
 		}
@@ -1381,14 +1398,14 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 			.eq(LosAuditPathsActs::getIsEnable, 1)
 			.eq(LosAuditPathsActs::getFidStatus, "status")
 			.eq(LosAuditPathsActs::getTenantId, AuthUtil.getTenantId())
-			.eq(LosAuditPathsActs::getSalesCompanyId, AuthUtil.getDeptId())
+			.eq(LosAuditPathsActs::getSalesCompanyId, declare.getBranchId())
 			.eq(LosAuditPathsActs::getActId, actId);
 		pathsActs = auditPathsActsService.getOne(auditPathsActsLambdaQueryWrapper);
 		//获取审批信息
 		LosAuditPathsActs losAuditPathsActs = auditPathsActsService.getOne(new LambdaQueryWrapper<LosAuditPathsActs>()
 			.eq(LosAuditPathsActs::getActId, actId)
 			.eq(LosAuditPathsActs::getFidStatus, "status")
-			.eq(LosAuditPathsActs::getSalesCompanyId, AuthUtil.getDeptId())
+			.eq(LosAuditPathsActs::getSalesCompanyId, declare.getBranchId())
 			.eq(LosAuditPathsActs::getTenantId, AuthUtil.getTenantId()));
 		Long pathId = losAuditPathsActs.getPathId();
 		auditPathsLevels = auditPathsLevelsService.list(new LambdaQueryWrapper<LosAuditPathsLevels>()
@@ -1425,18 +1442,13 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 			auditProecessDTO.setMorderNo(declare.getMblno());
 			auditProecessDTO.setBookingAgentId(declare.getBookingAgentId());
 			auditProecessDTO.setBookingAgentCnName(declare.getBookingAgentCnName());
-			if (ObjectUtils.isNotNull(declare.getCreateDept())) {
-				auditProecessDTO.setSalesCompanyId(Long.parseLong(declare.getCreateDept()));
-				auditProecessDTO.setSalesCompanyName(declare.getCreateDeptName());
-			} else {
-				auditProecessDTO.setSalesCompanyId(Long.parseLong(AuthUtil.getDeptId()));
-			}
+			auditProecessDTO.setSalesCompanyId(Long.parseLong(declare.getBranchId()));
+			auditProecessDTO.setSalesCompanyName(declare.getBranchName());
 			auditProecessDTO.setPayAmount(declare.getAmountCrLoc());
 			auditProecessDTO.setReceivableAmount(declare.getAmountDrLoc());
 			auditProecessDTO.setGrossProfit(declare.getAmountProfit());
 			auditProecessDTO.setGrossProfitUsd(declare.getAmountProfitUsd());
 			auditProecessDTO.setGrossProfitLoc(declare.getAmountProfitLoc());
-			auditProecessDTO.setSalesCompanyName(declare.getCreateDeptName());
 			auditProecessDTO.setSrcId(declare.getSrcId());
 			auditProecessDTO.setSrcCnName(declare.getSrcCnName());
 			auditProecessDTO.setSrcEnName(declare.getSrcEnName());
@@ -2060,7 +2072,7 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 		if ("1".equals(type)) {
 			List<FeeCenter> feeCenterListSum = new ArrayList<>();
 			String exrateType = currencyUtils.standardCurrency(bills.getBranchId());
-			List<BCurExrate> curExrateList = currencyUtils.obtainRate(date1, "1",bills.getBranchId());
+			List<BCurExrate> curExrateList = currencyUtils.obtainRate(date1, "1", bills.getBranchId());
 			BigDecimal amountDr = new BigDecimal("0.00");
 			BigDecimal amountCr = new BigDecimal("0.00");
 			BigDecimal amountProfit;
@@ -2380,6 +2392,9 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 			throw new RuntimeException("缺少必要参数");
 		}
 		Bills detail = baseMapper.selectById(bills.getId());
+		if (ObjectUtils.isNull(detail.getActualEtd())){
+			throw new RuntimeException("请先维护实际开船日期");
+		}
 		detail.setTransferOrderStatus("已转单");
 		detail.setUpdateUser(AuthUtil.getUserId());
 		detail.setUpdateUserName(AuthUtil.getUserName());
@@ -2753,7 +2768,7 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 		);
 		Date date = new Date();
 		String exrateType = currencyUtils.standardCurrency(billsJk.getBranchId());
-		List<BCurExrate> curExrateList = currencyUtils.obtainRate(date, "1",billsJk.getBranchId());
+		List<BCurExrate> curExrateList = currencyUtils.obtainRate(date, "1", billsJk.getBranchId());
 		if (!feeCenterList.isEmpty()) {
 			statusD += 1;
 			for (FeeCenter item : feeCenterList) {
@@ -3096,14 +3111,14 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 			.eq(LosAuditPathsActs::getIsEnable, 1)
 			.eq(LosAuditPathsActs::getFidStatus, "status")
 			.eq(LosAuditPathsActs::getTenantId, AuthUtil.getTenantId())
-			.eq(LosAuditPathsActs::getSalesCompanyId, AuthUtil.getDeptId())
+			.eq(LosAuditPathsActs::getSalesCompanyId, billsList.get(0).getBranchId())
 			.eq(LosAuditPathsActs::getActId, actId);
 		pathsActs = auditPathsActsService.getOne(auditPathsActsLambdaQueryWrapper);
 		//获取审批信息
 		LosAuditPathsActs losAuditPathsActs = auditPathsActsService.getOne(new LambdaQueryWrapper<LosAuditPathsActs>()
 			.eq(LosAuditPathsActs::getActId, actId)
 			.eq(LosAuditPathsActs::getFidStatus, "status")
-			.eq(LosAuditPathsActs::getSalesCompanyId, AuthUtil.getDeptId())
+			.eq(LosAuditPathsActs::getSalesCompanyId, billsList.get(0).getBranchId())
 			.eq(LosAuditPathsActs::getTenantId, AuthUtil.getTenantId()));
 		Long pathId = losAuditPathsActs.getPathId();
 		auditPathsLevels = auditPathsLevelsService.list(new LambdaQueryWrapper<LosAuditPathsLevels>()
@@ -3168,18 +3183,13 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 				auditProecessDTO.setMorderNo(declare.getMblno());
 				auditProecessDTO.setBookingAgentId(declare.getBookingAgentId());
 				auditProecessDTO.setBookingAgentCnName(declare.getBookingAgentCnName());
-				if (ObjectUtils.isNotNull(declare.getCreateDept())) {
-					auditProecessDTO.setSalesCompanyId(Long.parseLong(declare.getCreateDept()));
-					auditProecessDTO.setSalesCompanyName(declare.getCreateDeptName());
-				} else {
-					auditProecessDTO.setSalesCompanyId(Long.parseLong(AuthUtil.getDeptId()));
-				}
+				auditProecessDTO.setSalesCompanyId(Long.parseLong(declare.getBranchId()));
+				auditProecessDTO.setSalesCompanyName(declare.getBranchName());
 				auditProecessDTO.setPayAmount(declare.getAmountCrLoc());
 				auditProecessDTO.setReceivableAmount(declare.getAmountDrLoc());
 				auditProecessDTO.setGrossProfit(declare.getAmountProfit());
 				auditProecessDTO.setGrossProfitUsd(declare.getAmountProfitUsd());
 				auditProecessDTO.setGrossProfitLoc(declare.getAmountProfitLoc());
-				auditProecessDTO.setSalesCompanyName(declare.getCreateDeptName());
 				auditProecessDTO.setSrcId(declare.getSrcId());
 				auditProecessDTO.setSrcCnName(declare.getSrcCnName());
 				auditProecessDTO.setSrcEnName(declare.getSrcEnName());

blade-service/blade-los/src/main/java/org/springblade/los/check/controller/AuditPathsActsController.java

@@ -19,6 +19,7 @@ package org.springblade.los.check.controller;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.Api;
@@ -70,8 +71,10 @@ public class AuditPathsActsController extends BladeController {
 		LambdaQueryWrapper<LosAuditPathsActs> lambdaQueryWrapper=new LambdaQueryWrapper<>();
 		lambdaQueryWrapper.eq(LosAuditPathsActs::getTenantId, AuthUtil.getTenantId());
 		lambdaQueryWrapper.like(StringUtils.isNotBlank(auditPathsActs.getActName()),LosAuditPathsActs::getActName,auditPathsActs.getActName());
-		if (!AuthUtil.getUserRole().contains("admin")) {
-			lambdaQueryWrapper.eq(LosAuditPathsActs::getSalesCompanyId, deptUtils.getDeptPid());//公司
+		if (!AuthUtil.getUserRole().contains("总部") && !AuthUtil.getUserRole().contains("admin")) {
+			lambdaQueryWrapper.eq(LosAuditPathsActs::getSalesCompanyId, AuthUtil.getDeptId());
+		} else {
+			lambdaQueryWrapper.eq(ObjectUtils.isNotNull(auditPathsActs.getSalesCompanyId()), LosAuditPathsActs::getSalesCompanyId, auditPathsActs.getSalesCompanyId());
 		}
 		IPage<LosAuditPathsActs> pages = auditPathsActsService.page(Condition.getPage(query), lambdaQueryWrapper);
 		List<LosAuditPathsActs> records = pages.getRecords();

blade-service/blade-los/src/main/java/org/springblade/los/check/controller/AuditPathsController.java

@@ -19,6 +19,7 @@ package org.springblade.los.check.controller;
 import com.alibaba.cloud.commons.lang.StringUtils;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -35,6 +36,7 @@ import org.springblade.los.Util.IDeptUtils;
 import org.springblade.los.check.entity.LosAuditPaths;
 import org.springblade.los.check.entity.LosAuditPathsActs;
 import org.springblade.los.check.entity.LosAuditPathsLevels;
+import org.springblade.los.check.entity.LosAuditProecess;
 import org.springblade.los.check.service.IAuditPathsActsService;
 import org.springblade.los.check.service.IAuditPathsLevelsService;
 import org.springblade.los.check.service.IAuditPathsService;
@@ -90,8 +92,10 @@ public class AuditPathsController extends BladeController {
 		lambdaQueryWrapper.like(StringUtils.isNotBlank(auditPaths.getPathName()),LosAuditPaths::getPathName,auditPaths.getPathName())
 			.eq(LosAuditPaths::getTenantId, AuthUtil.getTenantId())
 			.orderByDesc(LosAuditPaths::getOpDate);
-		if (!AuthUtil.getUserRole().contains("admin")) {
-			lambdaQueryWrapper.eq(LosAuditPaths::getSalesCompanyId, deptUtils.getDeptPid());//公司
+		if (!AuthUtil.getUserRole().contains("总部") && !AuthUtil.getUserRole().contains("admin")) {
+			lambdaQueryWrapper.eq(LosAuditPaths::getSalesCompanyId, AuthUtil.getDeptId());
+		} else {
+			lambdaQueryWrapper.eq(ObjectUtils.isNotNull(auditPaths.getSalesCompanyId()), LosAuditPaths::getSalesCompanyId, auditPaths.getSalesCompanyId());
 		}
 		IPage<LosAuditPaths> pages = auditPathsService.page(Condition.getPage(query),lambdaQueryWrapper);
 		return R.data(pages);

blade-service/blade-los/src/main/java/org/springblade/los/check/controller/AuditPathsLevelsController.java

@@ -17,6 +17,7 @@
 package org.springblade.los.check.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -28,6 +29,7 @@ import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.los.check.entity.LosAuditPathsActs;
 import org.springblade.los.check.entity.LosAuditPathsLevels;
 import org.springblade.los.check.service.IAuditPathsLevelsService;
 import org.springblade.los.check.vo.LosAuditPathsLevelsVO;
@@ -67,8 +69,12 @@ public class AuditPathsLevelsController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入auditPathsLevels")
 	public R<IPage<LosAuditPathsLevels>> list(LosAuditPathsLevels auditPathsLevels, Query query) {
-		if (!AuthUtil.getUserRole().contains("admin")) {
+		if (!AuthUtil.getUserRole().contains("总部") && !AuthUtil.getUserRole().contains("admin")) {
 			auditPathsLevels.setSalesCompanyId(Long.parseLong(AuthUtil.getDeptId()));
+		} else {
+			if (ObjectUtils.isNotNull(auditPathsLevels.getSalesCompanyId())){
+				auditPathsLevels.setSalesCompanyId(auditPathsLevels.getSalesCompanyId());
+			}
 		}
 		IPage<LosAuditPathsLevels> pages = auditPathsLevelsService.page(Condition.getPage(query), Condition.getQueryWrapper(auditPathsLevels));
 		return R.data(pages);

blade-service/blade-los/src/main/java/org/springblade/los/check/controller/AuditProecessController.java

@@ -79,7 +79,6 @@ public class AuditProecessController extends BladeController {
 	public R list(LosAuditProecess auditProecess, Query query) {
 		LambdaQueryWrapper<LosAuditProecess> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 		lambdaQueryWrapper.eq(LosAuditProecess::getIsDelete, 0);//是否删除
-		lambdaQueryWrapper.like(LosAuditProecess::getAuditUserId, String.valueOf(AuthUtil.getUserId()));//审核人id
 		lambdaQueryWrapper.eq(StringUtils.isNotBlank(auditProecess.getProcessType()), LosAuditProecess::getProcessType, auditProecess.getProcessType());//业务类型
 		lambdaQueryWrapper.eq(StringUtils.isNotBlank(auditProecess.getAuditStatus()), LosAuditProecess::getAuditStatus, auditProecess.getAuditStatus());//审核状态
 		lambdaQueryWrapper.eq(auditProecess.getCorpId() != null, LosAuditProecess::getCorpId, auditProecess.getCorpId());//往来单位
@@ -98,8 +97,11 @@ public class AuditProecessController extends BladeController {
 			lambdaQueryWrapper.lt(LosAuditProecess::getEtd, auditProecess.getEtdList().get(1));
 		}
 		lambdaQueryWrapper.ne(StringUtils.isBlank(auditProecess.getAuditStatus()), LosAuditProecess::getAuditStatus, "N");
-		if (!AuthUtil.getUserRole().contains("admin")) {
-			lambdaQueryWrapper.eq(LosAuditProecess::getSalesCompanyId, deptUtils.getDeptPid());//公司
+		if (!AuthUtil.getUserRole().contains("总部") && !AuthUtil.getUserRole().contains("admin")) {
+			lambdaQueryWrapper.like(LosAuditProecess::getAuditUserId, String.valueOf(AuthUtil.getUserId()));//审核人id
+			lambdaQueryWrapper.eq(LosAuditProecess::getSalesCompanyId, AuthUtil.getDeptId());
+		} else {
+			lambdaQueryWrapper.eq(ObjectUtils.isNotNull(auditProecess.getSalesCompanyId()), LosAuditProecess::getSalesCompanyId, auditProecess.getSalesCompanyId());
 		}
 		IPage pages = auditProecessService.page(Condition.getPage(query), lambdaQueryWrapper);
 		List<LosAuditProecess> auditProecessList = pages.getRecords();
@@ -234,7 +236,7 @@ public class AuditProecessController extends BladeController {
 		}
 		if ("HYCK-DJ".equals(proecess.getCheckType()) || "HYJK-DJ".equals(proecess.getCheckType())) {
 			auditProecessService.losBillsCheck(auditProecess);
-		}  else if ("HYCK-FFSQ".equals(proecess.getCheckType())) {
+		} else if ("HYCK-FFSQ".equals(proecess.getCheckType())) {
 			auditProecessService.losStlBillsCheck(auditProecess);
 		} else if ("HYCK-FPSQ".equals(proecess.getCheckType())) {
 			auditProecessService.losFinInvoicesCheck(auditProecess);
@@ -242,7 +244,7 @@ public class AuditProecessController extends BladeController {
 			auditProecessService.amendsCheck(auditProecess);
 		} else if ("HXCB_SOC".equals(proecess.getCheckType()) || "HXCB_COC".equals(proecess.getCheckType())) {
 			auditProecessService.routeCostCheck(auditProecess);
-		}else if ("FYSQ".equals(proecess.getCheckType())) {
+		} else if ("FYSQ".equals(proecess.getCheckType())) {
 			auditProecessService.pleaseVerifyCostCheck(auditProecess);
 		}
 		return R.data(auditProecess);

blade-service/blade-los/src/main/java/org/springblade/los/external/Luhaitong/ApiController.java

@@ -42,7 +42,7 @@ public class ApiController {
 	@ApiOperation(value = "详情", notes = "传入reports")
 	public R detail(@RequestParam("billNo") String billNo, @RequestParam("station") String station) throws IOException {
 		String geturl = "https://www.sdland-sea.com/station/billSearch?billNo=" + billNo + "&type=" + station;
-		String auth = sysClient.getParamServiceByDept("secret_key", AuthUtil.getTenantId(), AuthUtil.getDeptId());
+		String auth = sysClient.getParamService("secret_key");
 		if (ObjectUtils.isNull(auth)) {
 			throw new RemoteException("陆海通秘钥为空，请先维护");
 		}

blade-service/blade-los/src/main/java/org/springblade/los/finance/fee/controller/FinAccBillsController.java

@@ -136,6 +136,11 @@ public class FinAccBillsController extends BladeController {
 		lambdaQueryWrapper.le(ObjectUtils.isNotNull(finAccBills.getOutboundDateStart()), FinAccBills::getOutboundDate, finAccBills.getOutboundDateStart());
 		lambdaQueryWrapper.le(ObjectUtils.isNotNull(finAccBills.getOutboundDateEnd()), FinAccBills::getOutboundDate, finAccBills.getOutboundDateEnd());
 		lambdaQueryWrapper.orderByDesc(FinAccBills::getCreateTime);
+		if (!AuthUtil.getUserRole().contains("总部") && !AuthUtil.getUserRole().contains("admin")) {
+			lambdaQueryWrapper.eq( FinAccBills::getBranchId, AuthUtil.getDeptId());
+		} else {
+			lambdaQueryWrapper.eq(ObjectUtils.isNotNull(finAccBills.getBranchId()), FinAccBills::getBranchId, finAccBills.getBranchId());
+		}
 		IPage<FinAccBills> pages = finAccBillsService.page(Condition.getPage(query), lambdaQueryWrapper);
 		/*for (FinAccBills item : pages.getRecords()) {
 			if (feeCenterList.size() > 0) {
@@ -302,6 +307,11 @@ public class FinAccBillsController extends BladeController {
 		lambdaQueryWrapper.ge(ObjectUtils.isNotNull(finAccBills.getApprovedDateStart()), FinAccBills::getApprovedDate, finAccBills.getApprovedDateStart());
 		lambdaQueryWrapper.le(ObjectUtils.isNotNull(finAccBills.getApprovedDateEnd()), FinAccBills::getApprovedDate, finAccBills.getApprovedDateEnd());
 		lambdaQueryWrapper.orderByDesc(FinAccBills::getCreateTime);
+		if (!AuthUtil.getUserRole().contains("总部") && !AuthUtil.getUserRole().contains("admin")) {
+			lambdaQueryWrapper.eq( FinAccBills::getBranchId, AuthUtil.getDeptId());
+		} else {
+			lambdaQueryWrapper.eq(ObjectUtils.isNotNull(finAccBills.getBranchId()), FinAccBills::getBranchId, finAccBills.getBranchId());
+		}
 		List<FinAccBills> pages = finAccBillsService.list(Condition.getQueryWrapper(finAccBills));
 		return R.data(pages);
 	}

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

@@ -449,14 +449,8 @@ public class FinAccBillsServiceImpl extends ServiceImpl<FinAccBillsMapper, FinAc
 
 	@Override
 	public List<FinAccBillsVO> listAccBill(ListAccBillVO finAccBills) {
-		String whetherPostIdOpen = sysClient.getParamService("whether.postId.open");
-		if (ObjectUtils.isNotNull(whetherPostIdOpen) && "1".equals(whetherPostIdOpen)) {
-			if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("财务")) {
-				finAccBills.setPostId(AuthUtil.getPostId());
-			}
-		}
-		if (!AuthUtil.getUserRole().contains("admin")) {
-			finAccBills.setDeptId(deptUtils.getDeptPid());
+		if (!AuthUtil.getUserRole().contains("总部") && !AuthUtil.getUserRole().contains("admin")) {
+			finAccBills.setBranchId(AuthUtil.getDeptId());
 		}
 		return billsMapper.listAccBill(finAccBills);
 	}

blade-service/blade-los/src/main/java/org/springblade/los/finance/genleg/service/impl/FinGenlegServiceImpl.java

@@ -531,7 +531,7 @@ public class FinGenlegServiceImpl extends ServiceImpl<FinGenlegMapper, FinGenleg
 		Dept dept;
 		if (res.isSuccess() && res.getData() != null) {
 			dept = res.getData();
-			String status = sysClient.getParamServiceNew("is.update.default");
+			String status = sysClient.getParamService("is.update.default");
 			if ("1".equals(status)) {
 				R<User> resUser = userClient.userInfoById(AuthUtil.getUserId());
 				if (resUser.isSuccess() && resUser.getData() != null) {

blade-service/blade-los/src/main/java/org/springblade/los/finance/invoices/controller/FinInvoicesController.java

@@ -31,6 +31,7 @@ import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.los.finance.fee.entity.FinAccBills;
 import org.springblade.los.finance.invoices.entity.FinInvoices;
 import org.springblade.los.finance.invoices.service.IFinInvoicesService;
 import org.springblade.los.finance.invoices.vo.FinInvoicesVO;
@@ -98,6 +99,11 @@ public class FinInvoicesController extends BladeController {
 			.ge(ObjectUtils.isNotNull(finInvoices.getAccountDateFrom()), FinInvoices::getAccountDateFrom, finInvoices.getAccountDateFrom())
 			.le(ObjectUtils.isNotNull(finInvoices.getAccountDateTo()), FinInvoices::getAccountDateTo, finInvoices.getAccountDateTo())
 			.orderByDesc(FinInvoices::getCreateTime);
+		if (!AuthUtil.getUserRole().contains("总部") && !AuthUtil.getUserRole().contains("admin")) {
+			lambdaQueryWrapper.eq( FinInvoices::getBranchId, AuthUtil.getDeptId());
+		} else {
+			lambdaQueryWrapper.eq(ObjectUtils.isNotNull(finInvoices.getBranchId()), FinInvoices::getBranchId, finInvoices.getBranchId());
+		}
 		IPage<FinInvoices> pages = finInvoicesService.page(Condition.getPage(query), lambdaQueryWrapper);
 		return R.data(pages);
 	}

blade-service/blade-los/src/main/java/org/springblade/los/finance/stl/controller/FinStlBillsController.java

@@ -31,6 +31,7 @@ import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.los.finance.invoices.entity.FinInvoices;
 import org.springblade.los.finance.stl.entity.FinStlBills;
 import org.springblade.los.finance.stl.service.IFinStlBillsService;
 import org.springblade.los.finance.stl.vo.FinStlBillsVO;
@@ -115,6 +116,11 @@ public class FinStlBillsController extends BladeController {
 		lambdaQueryWrapper.ge(ObjectUtils.isNotNull(finStlBills.getAuditDateFrom()), FinStlBills::getAuditDateFrom, finStlBills.getAuditDateFrom());
 		lambdaQueryWrapper.le(ObjectUtils.isNotNull(finStlBills.getAuditDateTo()), FinStlBills::getAuditDateTo, finStlBills.getAuditDateTo());
 		lambdaQueryWrapper.orderByDesc(FinStlBills::getCreateTime);
+		if (!AuthUtil.getUserRole().contains("总部") && !AuthUtil.getUserRole().contains("admin")) {
+			lambdaQueryWrapper.eq( FinStlBills::getBranchId, AuthUtil.getDeptId());
+		} else {
+			lambdaQueryWrapper.eq(ObjectUtils.isNotNull(finStlBills.getBranchId()), FinStlBills::getBranchId, finStlBills.getBranchId());
+		}
 		IPage<FinStlBills> pages = finStlBillsService.page(Condition.getPage(query), lambdaQueryWrapper);
 		return R.data(pages);
 	}

blade-service/blade-los/src/main/java/org/springblade/los/finance/stl/service/impl/FinStlBillsServiceImpl.java

@@ -1036,7 +1036,7 @@ public class FinStlBillsServiceImpl extends ServiceImpl<FinStlBillsMapper, FinSt
 			throw new RuntimeException("请选择明细");
 		}
 		baseMapper.updateById(detail);
-		String status = sysClient.getParamServiceByDept("retreat.pledge", AuthUtil.getTenantId(), AuthUtil.getDeptId());
+		String status = sysClient.getParamService("retreat.pledge");
 		if (ObjectUtils.isNotNull(status) && "1".equals(status) && "D".equals(finStlBills.getDc())) {
 			List<Long> accIds = finStlBills.getFinStlBillsItemsList().stream()
 				.filter(e -> "D".equals(e.getDc()) && "YXF".equals(e.getFeeCode())).map(FinStlBillsItems::getAccBillId)
@@ -1326,7 +1326,7 @@ public class FinStlBillsServiceImpl extends ServiceImpl<FinStlBillsMapper, FinSt
 			throw new RuntimeException("请选择明细");
 		}
 		baseMapper.updateById(detail);
-		String status = sysClient.getParamServiceByDept("retreat.pledge", AuthUtil.getTenantId(), AuthUtil.getDeptId());
+		String status = sysClient.getParamService("retreat.pledge");
 		if (ObjectUtils.isNotNull(status) && "1".equals(status) && "D".equals(finStlBills.getDc())) {
 			List<Long> accIds = finStlBills.getFinStlBillsItemsList().stream()
 				.filter(e -> "D".equals(e.getDc()) && "YXF".equals(e.getFeeCode())).map(FinStlBillsItems::getAccBillId)
@@ -1558,14 +1558,14 @@ public class FinStlBillsServiceImpl extends ServiceImpl<FinStlBillsMapper, FinSt
 			.eq(LosAuditPathsActs::getIsEnable, 1)
 			.eq(LosAuditPathsActs::getFidStatus, "status")
 			.eq(LosAuditPathsActs::getTenantId, AuthUtil.getTenantId())
-			.eq(LosAuditPathsActs::getSalesCompanyId, deptUtils.getDeptPid())
+			.eq(LosAuditPathsActs::getSalesCompanyId,detail.getBranchId())
 			.eq(LosAuditPathsActs::getActId, 1109);
 		pathsActs = auditPathsActsService.getOne(auditPathsActsLambdaQueryWrapper);
 		//获取审批信息
 		LosAuditPathsActs losAuditPathsActs = auditPathsActsService.getOne(new LambdaQueryWrapper<LosAuditPathsActs>()
 			.eq(LosAuditPathsActs::getActId, 1109)
 			.eq(LosAuditPathsActs::getFidStatus, "status")
-			.eq(LosAuditPathsActs::getSalesCompanyId, deptUtils.getDeptPid())
+			.eq(LosAuditPathsActs::getSalesCompanyId, detail.getBranchId())
 			.eq(LosAuditPathsActs::getTenantId, AuthUtil.getTenantId()));
 		Long pathId = losAuditPathsActs.getPathId();
 		auditPathsLevels = auditPathsLevelsService.list(new LambdaQueryWrapper<LosAuditPathsLevels>()
@@ -1599,8 +1599,8 @@ public class FinStlBillsServiceImpl extends ServiceImpl<FinStlBillsMapper, FinSt
 			auditProecessDTO.setBillTime(detail.getCreateTime());
 			auditProecessDTO.setTenantId(AuthUtil.getTenantId());
 			auditProecessDTO.setCorpId(detail.getCorpId());
-			auditProecessDTO.setSalesCompanyId(deptUtils.getDeptPid());
-			auditProecessDTO.setSalesCompanyName(detail.getCreateDeptName());
+			auditProecessDTO.setSalesCompanyId(Long.parseLong(detail.getBranchId()));
+			auditProecessDTO.setSalesCompanyName(detail.getBranchName());
 			auditProecessDTO.setPayAmount(detail.getAmountCrLoc());
 			auditProecessDTO.setReceivableAmount(detail.getAmountDrLoc());
 			auditProecessDTO.setGrossProfit(detail.getAmountSubLoc());