Просмотр исходного кода

修改中心仓分隔符与app其他仓登录缺少类型问题处理

liyuan 1 день назад
Родитель
Сommit
680f528504

+ 1 - 0
blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java

@@ -600,6 +600,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
 		insertPlatformCorpsDesc.setCode(String.valueOf(corpsDesc.getId()));
 		insertPlatformCorpsDesc.setTel(corpsDesc.getTel());
 		insertPlatformCorpsDesc.setAttn(Objects.isNull(corpsDesc.getPjCorpsAttn()) ? null : corpsDesc.getPjCorpsAttn().getCname());
+		insertPlatformCorpsDesc.setCorpType("KH");
 		insertPlatformCorpsDesc.setTenantId(PlatformConstant.PLATFORM_CODE);
 		boolean success = corpsDescClient.insertCorpsDataByUser(insertPlatformCorpsDesc);
 		if (!success) {

+ 2 - 2
blade-service/tire-center-warehouse/src/main/java/com/ecp/tire/center/warehouse/plan/impl/CenterOrderPlanServiceImpl.java

@@ -353,9 +353,9 @@ public class CenterOrderPlanServiceImpl extends ServiceImpl<CenterOrderPlanMappe
 				.in(CenterStockDesc::getGoodsId, centerOrderPlanItemList.stream().map(CenterOrderPlanItem::getGoodsId).distinct().collect(Collectors.toList())));
 			List<CenterStockDesc> insertOrUpdateList = new ArrayList<>();
 			Map<String, List<CenterOrderPlanItem>> mapList = centerOrderPlanItemList.stream().filter(item -> !NumberEnum.ONE.number.equals(item.getIsDeleted()))
-				.collect(Collectors.groupingBy(plan -> plan.getBillId() + "-" + plan.getGoodsId() + "-" + plan.getDot() + "-" + plan.getRegionId()));
+				.collect(Collectors.groupingBy(plan -> plan.getBillId() + "(~!)" + plan.getGoodsId() + "(~!)" + plan.getDot() + "(~!)" + plan.getRegionId()));
 			for (Map.Entry<String, List<CenterOrderPlanItem>> mapData : mapList.entrySet()) {
-				String[] params = mapData.getKey().split("-");
+				String[] params = mapData.getKey().split("(~!)");
 				Long planId = Long.valueOf(params[0]);
 				Long goodsId = Long.valueOf(params[1]);
 				String dot = params[2];