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

blade-service-api/blade-land-api/src/main/java/org/springblade/land/entity/Order.java

@@ -255,12 +255,21 @@ public class Order implements Serializable {
 	private String corpShortName;
 
 	@TableField(exist = false)
+	private String fleetNameDetail;
+
+	@TableField(exist = false)
 	private String salesmanName;
 
 	@TableField(exist = false)
 	private String salesmanDeptName;
 
 	@TableField(exist = false)
+	private String dispatcherName;
+
+	@TableField(exist = false)
+	private String dispatchDeptName;
+
+	@TableField(exist = false)
 	private String agentName;
 
 	@TableField(exist = false)

blade-service/blade-client/src/main/java/org/springblade/client/serial/service/impl/TableMessageServiceImpl.java

@@ -92,17 +92,17 @@ public class TableMessageServiceImpl extends ServiceImpl<TableMessageMapper, Tab
 		Integer i;
 		TableMessage message = baseMapper.selectOne(new QueryWrapper<TableMessage>().eq("create_user", SecureUtil.getUserId()).eq("file_name", tableMessage.getFileName())
 			.eq("tenant_id",SecureUtil.getTenantId()).eq("is_deleted",0));
-		tableMessage.setCreateDept(Long.valueOf(SecureUtil.getUser().getDeptId()));
+		// tableMessage.setCreateDept(Long.valueOf(SecureUtil.getUser().getDeptId()));
 		Date date = new Date();
 		if (message == null) {
 			tableMessage.setTenantId(SecureUtil.getTenantId());
-			tableMessage.setCreateDept(Long.valueOf(SecureUtil.getDeptId()));
+			// tableMessage.setCreateDept(Long.valueOf(SecureUtil.getDeptId()));
 			tableMessage.setCreateUser(SecureUtil.getUserId());
 			tableMessage.setCreateTime(DateUtil.fromDate(date));
 			i = baseMapper.insert(tableMessage);
 		} else {
 			tableMessage.setTenantId(SecureUtil.getTenantId());
-			tableMessage.setCreateDept(Long.valueOf(SecureUtil.getDeptId()));
+			// tableMessage.setCreateDept(Long.valueOf(SecureUtil.getDeptId()));
 			tableMessage.setUpdateUser(SecureUtil.getUserId());
 			tableMessage.setUpdateTime(DateUtil.fromDate(date));
 			tableMessage.setId(message.getId());

blade-service/blade-land/src/main/java/org/springblade/land/service/impl/OrderServiceImpl.java

@@ -131,6 +131,18 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 					detail.setSalesmanDeptName(dept.getData());
 				}
 			}
+			if (!ObjectUtil.isEmpty(detail.getDispatcher())) {
+				R<User> user = userClient.userInfoById(detail.getDispatcher());
+				if (user.isSuccess() && user.getData() != null) {
+					detail.setDispatcherName(user.getData().getRealName());
+				}
+			}
+			if (!ObjectUtil.isEmpty(detail.getDispatchDept())) {
+				R<String> dept = sysClient.getDeptName(detail.getDispatchDept());
+				if (dept.isSuccess() && dept.getData() != null) {
+					detail.setDispatchDeptName(dept.getData());
+				}
+			}
 			if (!ObjectUtil.isEmpty(detail.getAgentId())) {
 				R<CorpsDesc> agent = corpsDescClient.getCorpMessage(detail.getAgentId());
 				if (agent.isSuccess() && agent.getData() != null) {
@@ -249,6 +261,18 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 					record.setSalesmanName(user.getData().getRealName());
 				}
 			}
+			if (!ObjectUtil.isEmpty(record.getDispatcher())) {
+				R<User> user = userClient.userInfoById(record.getDispatcher());
+				if (user.isSuccess() && user.getData() != null) {
+					record.setDispatcherName(user.getData().getRealName());
+				}
+			}
+			if (!ObjectUtil.isEmpty(record.getDispatchDept())) {
+				R<String> dept = sysClient.getDeptName(record.getDispatchDept());
+				if (dept.isSuccess() && dept.getData() != null) {
+					record.setDispatchDeptName(dept.getData());
+				}
+			}
 
 			// 列表箱量显示处理
 			if (record.getStatus() == 0) {
@@ -343,6 +367,19 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 					if (StringUtil.isNotBlank(statusDetail)) {
 						record.setItemStatusDetail(statusDetail.substring(0, statusDetail.lastIndexOf(";")));
 					}
+
+					// 车队拼接
+					List<String> fleetNameDetail = new ArrayList<>();
+					List<Long> fleetIdList = itemList.stream().map(OrderItem::getFleetId).filter(Objects::nonNull).distinct().collect(Collectors.toList());
+					for (Long fleetId : fleetIdList) {
+						R<CorpsDesc> fleet = corpsDescClient.getCorpMessage(fleetId);
+						if (fleet.isSuccess() && fleet.getData() != null) {
+							if (StringUtil.isNotBlank(fleet.getData().getShortName())) {
+								fleetNameDetail.add(fleet.getData().getShortName());
+							}
+						}
+					}
+					record.setFleetNameDetail(String.join(",", fleetNameDetail));
 				}
 			}
 

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

@@ -449,12 +449,15 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
 		List<String> pidList = new ArrayList<>();
 		idList.forEach(id -> {
 			R<Dept> deptR = sysClient.getDept(Long.valueOf(id));
-			String[] ancestors = deptR.getData().getAncestors().split(",");
-			if (ancestors.length > 1) {
-				pidList.add(ancestors[1]);
-			} else {
-				pidList.add(deptId);
+			if (deptR.isSuccess() && ObjectUtil.isNotEmpty(deptR.getData())) {
+				String[] ancestors = deptR.getData().getAncestors().split(",");
+				if (ancestors.length > 1) {
+					pidList.add(ancestors[1]);
+				} else {
+					pidList.add(deptId);
+				}
 			}
+			pidList.add(deptId);
 		});
 		return pidList.stream().distinct().collect(Collectors.joining(","));
 	}