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

blade-service/blade-los/src/main/java/org/springblade/los/trade/service/impl/AgentServiceImpl.java

@@ -1890,6 +1890,15 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
 		List<FinStlBillsItems> stlBillsItemsList = new ArrayList<>();
 		List<FeeCenter> feeCenters1 = new ArrayList<>();
 		for (FeeCenter item : feeCentersList) {
+			if ("SFK,WK".contains(item.getFeeCode()) && "C".equals(item.getDc()) && 0 == item.getStlStatus()
+				&& feeCenterIds.contains(item.getId())) {
+				item.setAmount(agent.getExchangeRate().multiply(item.getAmountLoc()).setScale(2, RoundingMode.HALF_UP));
+				item.setPrice(item.getAmount());
+				item.setDiscountExrate(agent.getDiscountRate());
+				BigDecimal discountAmount = agent.getDiscountRate().multiply(item.getAmountLoc()).setScale(2, RoundingMode.HALF_UP);
+				item.setProfit(item.getAmount().subtract(discountAmount));
+				item.setStlExrate(agent.getExchangeRate());
+			}
 			if (1 == item.getStlStatus()) {
 				throw new RuntimeException("费用：" + item.getFeeCnName() + "已确认");
 			}

blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java

@@ -122,6 +122,9 @@ public class UserController {
 		if (AuthUtil.getTenantId().equals("119111") && StringUtil.isBlank(userVO.getRoleAlias())) {
 			userVO.setRoleAlias("业务员");
 		}
+		if (AuthUtil.getTenantId().equals("809700") && StringUtil.isBlank(userVO.getRoleAlias())) {
+			userVO.setRoleAlias("业务员");
+		}
 		LambdaQueryWrapper<User> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 		lambdaQueryWrapper.like(StringUtils.isNotBlank(userVO.getRealName()), User::getRealName, userVO.getRealName())
 			.like(ObjectUtil.isNotEmpty(userVO.getDeptPid()), User::getDeptPid, userVO.getDeptPid())