修复bug和备份数据

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/service/impl/OmsOrderServiceImpl.java

@@ -42,7 +42,7 @@ public class OmsOrderServiceImpl implements OmsOrderService {
 
     @Override
     public List<OmsOrder> list(OmsOrderQueryParam queryParam, Integer pageSize, Integer pageNum) {
-        long compId = CurrUserUtil.getCompId();
+        Long compId = CurrUserUtil.getCompIdInfo();
         if(!StringUtils.isEmpty(compId)){
             queryParam.setCompId(compId);
         }

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/service/impl/PmsProductServiceImpl.java

@@ -222,9 +222,7 @@ public class PmsProductServiceImpl implements PmsProductService {
         relateAndInsertList(productAttributeValueDao, productParam.getProductAttributeValueList(), id);
         //关联专题
         List<CmsSubjectProductRelationInput> subjectProductRelationList = productParam.getSubjectProductRelationList();
-        if (subjectProductRelationList.size() != 0 || StringUtils.isEmpty(subjectProductRelationList)) {
-            subjectService.relateAndUpdateList(productParam.getSubjectProductRelationList(), id);
-        }
+        subjectService.relateAndUpdateList(productParam.getSubjectProductRelationList(), id);
 //        //关联优选
 //        prefrenceAreaService.relateAndUpdateList(productParam.getPrefrenceAreaProductRelationList(), id);
         count = 1;