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-api/blade-system-api/src/main/java/org/springblade/system/feign/ISysClient.java

@@ -73,7 +73,7 @@ public interface ISysClient {
 	 * 通过角色别名获
 	 * */
 	@GetMapping(GET_ROLE_ID_BY_ALIAS)
-	R<Long> getRoleByAlias(String alias);
+	R<Long> getRoleByAlias(@RequestParam("alias") String alias);
 
 
 	/**

blade-service/blade-client/src/main/java/org/springblade/client/corps/service/impl/CorpsDescServiceImpl.java

@@ -737,8 +737,8 @@ public class CorpsDescServiceImpl extends ServiceImpl<CorpsDescMapper, CorpsDesc
 	 * @return
 	 */
 	public void saveOrUpdateTypeDesc(CorpsDesc corpsDesc, Long userId, Long pId, Date date, String tenantId) {
-		corpsTypeDescService.remove(new QueryWrapper<CorpsTypeDesc>().eq("corp_id", corpsDesc.getId()));
 		if (StringUtils.isNotBlank(corpsDesc.getCorpsTypeId())) {
+			corpsTypeDescService.remove(new QueryWrapper<CorpsTypeDesc>().eq("corp_id", corpsDesc.getId()));
 			List<String> list = Arrays.asList(corpsDesc.getCorpsTypeId().split(","));
 			list.stream().forEach(item -> {
 				CorpsTypeDesc typeDesc = corpsTypeDescService.getOne(new QueryWrapper<CorpsTypeDesc>().eq("corp_id", pId)

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/controller/UserController.java

@@ -38,7 +38,9 @@ import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.constant.BladeConstant;
 import org.springblade.core.tool.constant.RoleConstant;
 import org.springblade.core.tool.utils.*;
+import org.springblade.system.entity.Role;
 import org.springblade.system.entity.Tenant;
+import org.springblade.system.feign.ISysClient;
 import org.springblade.system.feign.ITenantClient;
 import org.springblade.system.user.entity.User;
 import org.springblade.system.user.excel.UserExcel;
@@ -72,6 +74,7 @@ public class UserController {
 
 	private final IUserService userService;
 	private final ITenantClient tenantClient;
+	private final ISysClient sysClient;
 
 	/**
 	 * 查询单条
@@ -109,6 +112,14 @@ public class UserController {
 			.eq(User::getTenantId, AuthUtil.getTenantId())
 			.eq(User::getIsDeleted, 0);
 
+		if (ObjectUtil.isNotEmpty(userVO.getDeptPid())) {
+			R<Long> roleR = sysClient.getRoleByAlias("分管调度");
+			if (!roleR.isSuccess()) {
+				return R.data(new ArrayList<>());
+			}
+			lambdaQueryWrapper.like(User::getRoleId, roleR.getData());
+		}
+
 		if (StringUtil.isNotBlank(userVO.getUserExt())) {
 			List<Long> userIdList = userService.getUserIdByCorpId(Long.parseLong(userVO.getUserExt()));
 			if (CollectionUtil.isNotEmpty(userIdList)) {