达沃特 禅道 2023年5月29日10:10:30

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/service/impl/DeliveryServiceImpl.java

@@ -1725,7 +1725,7 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 			throw new SecurityException("获取凭证信息失败");
 		}
 		delivery.setVoucherId(voucher.getId());
-		delivery.setVoucherId(voucher.getVoucherno());
+		delivery.setVoucherNo(voucher.getVoucherno());
 		return delivery;
 	}
 

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/controller/OrderController.java

@@ -326,12 +326,12 @@ public class OrderController extends BladeController {
 				}
 				if (item.getCorpId() != null) {
 					if (ObjectUtil.isNotEmpty(corpsDescList)) {
-						item.setCorpsName(corpsDescList.stream().filter(e -> e.getId().equals(item.getCorpId())).findFirst().get().getCname());
+						item.setCorpsName(corpsDescList.stream().filter(e -> e.getId().equals(item.getCorpId())).findFirst().orElse(new CorpsDesc()).getCname());
 					}
 				}
 				if (item.getBelongToCorpId() != null) {
 					if (ObjectUtil.isNotEmpty(belongToCorpList)) {
-						item.setBelongToCorpName(belongToCorpList.stream().filter(e -> e.getId().equals(item.getBelongToCorpId())).findFirst().get().getCname());
+						item.setBelongToCorpName(belongToCorpList.stream().filter(e -> e.getId().equals(item.getBelongToCorpId())).findFirst().orElse(new CorpsDesc()).getCname());
 					}
 				}
 				if (item.getProductionPlant() != null) {

blade-service/blade-user/src/main/java/org/springblade/system/user/feign/UserClient.java

@@ -169,7 +169,9 @@ public class UserClient implements IUserClient {
 	public String selectUserByNames(String adminProfilesName) {
 		List<Long> ids = service.list(new LambdaQueryWrapper<User>().eq(User::getIsDeleted, 0)
 			.eq(User::getTenantId,AuthUtil.getTenantId())
-			.apply("find_in_set(real_name,'" + adminProfilesName + "')")).stream().map(User::getId).collect(Collectors.toList());
+			.apply("find_in_set(real_name,'" + adminProfilesName + "')")
+			.last("ORDER BY find_in_set(real_name,'"+ adminProfilesName + "')")
+			).stream().map(User::getId).collect(Collectors.toList());
 		List<String> idLists = new ArrayList<>();
 		for (Long id : ids) {
 			idLists.add(id + "");