个人账户上传bom修改

src/main/java/com/uas/platform/b2c/trade/seek/service/impl/SeekPurchaseBomServiceImpl.java

@@ -156,7 +156,9 @@ public class SeekPurchaseBomServiceImpl implements SeekPurchaseBomService {
         seekPurchaseBom.setName(bomName);
         seekPurchaseBom.setStatus(0);
         seekPurchaseBom.setUu(SystemSession.getUser().getUserUU());
-        seekPurchaseBom.setEnuu(SystemSession.getUser().getEnterprise().getUu());
+        if (null != SystemSession.getUser().getEnterprise()) {
+            seekPurchaseBom.setEnuu(SystemSession.getUser().getEnterprise().getUu());
+        }
         seekPurchaseBom = seekPurchaseBomDao.save(seekPurchaseBom);
         // 获取第一行的信息
         Row headerRow = sheet.getRow(0);
@@ -626,7 +628,12 @@ public class SeekPurchaseBomServiceImpl implements SeekPurchaseBomService {
         if (!StringUtils.isEmpty(keyword)) {
             pageInfo.expression(PredicateUtils.like("name", keyword, false));
         }
-        pageInfo.expression(PredicateUtils.eq("enuu", SystemSession.getUser().getEnterprise().getUu(), false));
+        pageInfo.expression(PredicateUtils.eq("uu", SystemSession.getUser().getUserUU(), false));
+        if (null != SystemSession.getUser().getEnterprise()) {
+            pageInfo.expression(PredicateUtils.eq("enuu", SystemSession.getUser().getEnterprise().getUu(), false));
+        } else {
+            pageInfo.expression(PredicateUtils.isNull("enuu"));
+        }
         return seekPurchaseBomDao.findAll(new Specification<SeekPurchaseBom>() {
             @Override
             public Predicate toPredicate(Root<SeekPurchaseBom> root, CriteriaQuery<?> query, CriteriaBuilder cb) {