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

blade-service-api/blade-purchase-sales-api/src/main/java/org/springblade/purchase/sales/vo/DatasetVO.java

@@ -63,6 +63,8 @@ public class DatasetVO {
 	 */
 	private BigDecimal actualQuantity;
 
+	private String chargeMember;
+
 	/**
 	 * 发货日期数组
 	 */

blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/Menu.java

@@ -70,12 +70,23 @@ public class Menu implements Serializable {
 	private String name;
 
 	/**
-	 * 菜单别名
+	 * 菜单别名英文
 	 */
-	@ApiModelProperty(value = "菜单别名")
+	@ApiModelProperty(value = "菜单别名英文")
 	private String alias;
 
 	/**
+	 * 菜单别名越南语
+	 */
+	@ApiModelProperty(value = "菜单别名越南语")
+	private String aliasVi;
+	/**
+	 * 菜单别名德语
+	 */
+	@ApiModelProperty(value = "菜单别名德语")
+	private String aliasDe;
+
+	/**
 	 * 请求地址
 	 */
 	@ApiModelProperty(value = "请求地址")

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/excel/DatasetExcel.java

@@ -23,6 +23,8 @@ public class DatasetExcel {
 
 	@ExcelProperty(value = "销售订单号")
 	private String orderNo;
+	@ExcelProperty(value = "业务员")
+	private String chargeMember;
 
 	@ExcelProperty(value = "客户名称")
 	private String corpName;

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/mapper/OrderItemsMapper.xml

@@ -476,7 +476,8 @@ WHERE
                t1.tenant_id       as tenantId,
                t2.price_type      as priceType,
                t1.receipt_time    as receiptTime,
-               t2.actual_quantity as actualQuantity
+               t2.actual_quantity as actualQuantity,
+        t1.charge_member as chargeMember
         from business_order t1
                  left join business_order_items t2 on t1.id = t2.pid
                  left join basic_corps_desc t3 on t1.corp_id = t3.id

blade-service/blade-system/src/main/java/org/springblade/system/service/impl/MenuServiceImpl.java

@@ -83,7 +83,7 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements IM
 
 
 	@Override
-	public List<MenuVO> routes(String roleId, Long topMenuId,String type) {
+	public List<MenuVO> routes(String roleId, Long topMenuId, String type) {
 		if (StringUtil.isBlank(roleId)) {
 			return null;
 		}
@@ -111,17 +111,21 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements IM
 				routes.stream().anyMatch(route -> route.getId().longValue() == x.getId().longValue())
 			).collect(Collectors.toList());
 		}
-		return buildRoutes(allMenus, roleMenus,type);
+		return buildRoutes(allMenus, roleMenus, type);
 	}
 
-	private List<MenuVO> buildRoutes(List<Menu> allMenus, List<Menu> roleMenus,String type) {
+	private List<MenuVO> buildRoutes(List<Menu> allMenus, List<Menu> roleMenus, String type) {
 		List<Menu> routes = new LinkedList<>(roleMenus);
 		roleMenus.forEach(roleMenu -> recursion(allMenus, routes, roleMenu));
 		routes.sort(Comparator.comparing(Menu::getSort));
 		MenuWrapper menuWrapper = new MenuWrapper();
-		for (Menu item : routes){
-			if ("en".equals(type)){
+		for (Menu item : routes) {
+			if ("en".equals(type)) {
 				item.setName(item.getAlias());
+			} else if ("vi".equals(type)) {
+				item.setName(item.getAliasVi());
+			} else if ("de".equals(type)) {
+				item.setName(item.getAliasDe());
 			}
 		}
 		List<Menu> collect = routes.stream().filter(x -> Func.equals(x.getCategory(), 1)).collect(Collectors.toList());
@@ -224,8 +228,8 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements IM
 				)
 			);
 		}
-		if (menu.getParentId() != null){
-			menuQueryWrapper.eq(Menu::getParentId,menu.getParentId());
+		if (menu.getParentId() != null) {
+			menuQueryWrapper.eq(Menu::getParentId, menu.getParentId());
 		}
 		Integer cnt = baseMapper.selectCount(menuQueryWrapper);
 		if (cnt > 0) {