ERP商品选择器

src/main/java/com/gic/plug/web/controller/goods/AppletConfigGoodsController.java

@@ -33,10 +33,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -250,7 +247,10 @@ public class AppletConfigGoodsController extends BaseGoodsController {
         searchDTO.setBegin((currentPage - 1) * pageSize);
         searchDTO.setRecordNumber(pageSize);
         JSONObject jsonObject = null;
-        JSONObject status = QueryConditionAssemblyUtil.createSimpleQueryNode("status", OperateEnum.OPERATE_EQ, 2);
+        JSONObject status = new JSONObject();
+        if (!Objects.equals(Constant.CHANNEL_CODE_ERP, channelCode)) {
+            status = QueryConditionAssemblyUtil.createSimpleQueryNode("status", OperateEnum.OPERATE_EQ, 2);
+        }
         if (Constant.CHANNEL_CODE_MALL.equals(channelCode)) {
             status = QueryConditionAssemblyUtil.addQueryNodeForSiblin(status, QueryConditionAssemblyUtil.createSimpleQueryNode("upShelfTime", OperateEnum.OPERATE_LTE, new Date().getTime()), OperateEnum.OPERATE_AND);
         }