索引中获取单据明细时不对detno字段进行非空判断

search-console/src/main/java/com/uas/search/console/service/impl/OrderSearchServiceImpl.java

@@ -379,14 +379,10 @@ public class OrderSearchServiceImpl implements OrderSearchService, InnerOrderSea
 					baseOrderDetails = new ArrayList<>();
 				}
 
-				Long id = Long.valueOf(document.get(OrderSearchUtils.getIdField(tableName)));
-				String code = document.get(OrderSearchUtils.getCodeField(tableName));
-				String detno = document.get(OrderSearchUtils.getDetnoField(tableName));
-				if (!StringUtils.isEmpty(detno)) {
-					baseOrderDetails.add(new BaseOrderDetail(id, Short.valueOf(detno), code));
-				} else {
-					baseOrderDetails.add(new BaseOrderDetail(id, null, code));
-				}
+				baseOrderDetails
+						.add(new BaseOrderDetail(Long.valueOf(document.get(OrderSearchUtils.getIdField(tableName))),
+								Short.valueOf(document.get(OrderSearchUtils.getDetnoField(tableName))),
+								document.get(OrderSearchUtils.getCodeField(tableName))));
 				map.put(orderId, baseOrderDetails);
 			}
 			// 获取主表数据
@@ -416,14 +412,9 @@ public class OrderSearchServiceImpl implements OrderSearchService, InnerOrderSea
 				id.toString());
 		List<BaseOrderDetail> baseOrderDetails = new ArrayList<>();
 		for (Document document : documents) {
-			Long detailId = Long.valueOf(document.get(OrderSearchUtils.getIdField(tableName)));
-			String code = document.get(OrderSearchUtils.getCodeField(tableName));
-			String detno = document.get(OrderSearchUtils.getDetnoField(tableName));
-			if (!StringUtils.isEmpty(detno)) {
-				baseOrderDetails.add(new BaseOrderDetail(detailId, Short.valueOf(detno), code));
-			} else {
-				baseOrderDetails.add(new BaseOrderDetail(detailId, null, code));
-			}
+			baseOrderDetails.add(new BaseOrderDetail(Long.valueOf(document.get(OrderSearchUtils.getIdField(tableName))),
+					Short.valueOf(document.get(OrderSearchUtils.getDetnoField(tableName))),
+					document.get(OrderSearchUtils.getCodeField(tableName))));
 		}
 		return baseOrderDetails;
 	}