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

处理处理企业物料库搜索报错的问题。

yujia 7 лет назад
Родитель
Сommit
cde765c0ac

+ 1 - 1
src/main/java/com/uas/platform/b2c/common/base/service/impl/SendMessageServiceImpl.java

@@ -45,7 +45,7 @@ public class SendMessageServiceImpl implements SendMessageService {
 			Set<String> userPhones = new HashSet<>();
 			Set<String> userPhones = new HashSet<>();
 			userPhones.add(userPhone);
 			userPhones.add(userPhone);
 			Object[] obj = {sellername,num};
 			Object[] obj = {sellername,num};
-			smsService.sendAll("a3c13206-1c0b-4bbb-a7d2-864043792092",userPhones,obj);
+			smsService.sendAll("398ad011-59e4-44d1-88cb-8cdfca3d725c",userPhones,obj);
 			//core中的接口
 			//core中的接口
 			/*SendMessageUtil.sendMessage(context, userPhones, name, type, new Callback<MessageLog>() {
 			/*SendMessageUtil.sendMessage(context, userPhones, name, type, new Callback<MessageLog>() {
 				@Override
 				@Override

+ 15 - 0
src/main/java/com/uas/platform/b2c/prod/commodity/model/V_ProductPerson.java

@@ -274,6 +274,12 @@ public class V_ProductPerson implements Serializable{
     @Column(name = "user_uu")
     @Column(name = "user_uu")
     private Long ppUserUU;
     private Long ppUserUU;
 
 
+    /**
+     * 规格书
+     */
+    @Column(name = "pr_attach")
+    private String attach;
+
     @Transient
     @Transient
     private ProductAttachSubmit productAttachSubmit;
     private ProductAttachSubmit productAttachSubmit;
 
 
@@ -619,4 +625,13 @@ public class V_ProductPerson implements Serializable{
         this.productAttachSubmit = productAttachSubmit;
         this.productAttachSubmit = productAttachSubmit;
         return this;
         return this;
     }
     }
+
+    public String getAttach() {
+        return attach;
+    }
+
+    public V_ProductPerson setAttach(String attach) {
+        this.attach = attach;
+        return this;
+    }
 }
 }

+ 6 - 5
src/main/java/com/uas/platform/b2c/prod/commodity/service/impl/ProductAttachServiceImpl.java

@@ -44,10 +44,7 @@ import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 import javax.persistence.criteria.Root;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 
 /**
 /**
  * Created by wangyc on 2018/6/26.
  * Created by wangyc on 2018/6/26.
@@ -255,7 +252,11 @@ public class ProductAttachServiceImpl implements ProductAttachService {
      */
      */
     @Override
     @Override
     public List<ProductAttachSubmit> findByProductidsAndStatus(List<Long> productids, Integer status) {
     public List<ProductAttachSubmit> findByProductidsAndStatus(List<Long> productids, Integer status) {
-        return productAttachSubmitDao.findByProductIdsAndStatus(productids, status);
+        if (CollectionUtils.isNotEmpty(productids) || status == null) {
+            return productAttachSubmitDao.findByProductIdsAndStatus(productids, status);
+        } else {
+            return Collections.emptyList();
+        }
     }
     }
 
 
     @Override
     @Override