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

【搜索中心】 判断为空值时作出相关处理

hejq 9 лет назад
Родитель
Сommit
7667977489

+ 13 - 10
search-console-b2b/src/main/java/com/uas/search/console/b2b/util/ObjectToDocumentUtils.java

@@ -10,6 +10,7 @@ import org.springframework.util.StringUtils;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.uas.platform.core.model.Constant;
 import com.uas.search.b2b.service.SearchService.Table_name;
 import com.uas.search.console.b2b.model.MakeAcceptSimpleInfo;
 import com.uas.search.console.b2b.model.MakeOrderChangeItemSimpleInfo;
@@ -735,7 +736,7 @@ public class ObjectToDocumentUtils {
 		// doc)无法根据id进行更新
 		document.add(
 				new StringField(ClassAndTableNameUtils.combineField(tableName, MakeOrderChangeItemSimpleInfo.ID_FIELD),
-				String.valueOf(makeChanges.getId()), Store.YES));
+						String.valueOf(makeChanges.getId()), Store.YES));
 		document.add(
 				new TextField(ClassAndTableNameUtils.combineField(tableName, MakeOrderChangeItemSimpleInfo.CODE_FIELD),
 						String.valueOf(makeChanges.getOrderCode()), Store.YES));
@@ -749,10 +750,9 @@ public class ObjectToDocumentUtils {
 					JSONObject.toJSONString(makeChanges.getProduct()), Store.YES));
 		}
 		if (!StringUtils.isEmpty(makeChanges.getMakeChanges())) {
-			document.add(
-					new TextField(
-							ClassAndTableNameUtils.combineField(tableName, MakeOrderChangeItemSimpleInfo.MAKE_FIELD),
-							JSONObject.toJSONString(makeChanges.getMakeChanges()), Store.YES));
+			document.add(new TextField(
+					ClassAndTableNameUtils.combineField(tableName, MakeOrderChangeItemSimpleInfo.MAKE_FIELD),
+					JSONObject.toJSONString(makeChanges.getMakeChanges()), Store.YES));
 		}
 		return document;
 	}
@@ -806,8 +806,8 @@ public class ObjectToDocumentUtils {
 	public static Document toDocument(SaleSendSimpleInfo saleSend) {
 		if (saleSend == null || saleSend.getId() == null || StringUtils.isEmpty(saleSend.getCode())
 				|| saleSend.getVend() == null || saleSend.getVend().getUu() == null
-				|| saleSend.getVerifystatus() == null || StringUtils.isEmpty(saleSend.getVend().getEnName())
-				|| saleSend.getEnterprise() == null || saleSend.getEnterprise().getUu() == null
+				|| StringUtils.isEmpty(saleSend.getVend().getEnName()) || saleSend.getEnterprise() == null
+				|| saleSend.getEnterprise().getUu() == null
 				|| StringUtils.isEmpty(saleSend.getEnterprise().getEnName())) {
 			return null;
 		}
@@ -819,8 +819,11 @@ public class ObjectToDocumentUtils {
 				String.valueOf(saleSend.getId()), Store.YES));
 		document.add(new TextField(ClassAndTableNameUtils.combineField(tableName, SaleSendSimpleInfo.CODE_FIELD),
 				String.valueOf(saleSend.getCode()), Store.YES));
-		document.add(new StringField(ClassAndTableNameUtils.combineField(tableName, SaleSendSimpleInfo.STATUS_FIELD),
-				String.valueOf(saleSend.getVerifystatus()), Store.YES));
+		if (saleSend.getVerifystatus() != null) {
+			document.add(
+					new StringField(ClassAndTableNameUtils.combineField(tableName, SaleSendSimpleInfo.STATUS_FIELD),
+							String.valueOf(saleSend.getVerifystatus()), Store.YES));
+		}
 		if (!StringUtils.isEmpty(saleSend.getDate())) {
 			document.add(new LongField(ClassAndTableNameUtils.combineField(tableName, SaleSendSimpleInfo.DATE_FIELD),
 					saleSend.getDate().getTime(), Store.YES));
@@ -879,7 +882,7 @@ public class ObjectToDocumentUtils {
 		} else {
 			document.add(
 					new TextField(ClassAndTableNameUtils.combineField(tableName, PurchaseNoticeSimpleInfo.END_FIELD),
-							String.valueOf(0), Store.YES));
+							String.valueOf(Constant.NO), Store.YES));
 		}
 		// vend和orderItems以json的格式存储
 		if (purcNotice.getOrderItem() != null) {