Merge remote-tracking branch 'origin/master'

purchase-system/src/main/java/com/ozs/pm/service/impl/PmDemandServiceImpl.java

@@ -1066,9 +1066,12 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
                     baseExpert.setStatus(NameListType.WHITE.getCode());
                 }
             }
-            if (ObjectUtils.isEmpty(baseExpert.getVarietyPurchase()) || !baseExpert.getVarietyPurchase().contains(pmDemand.getProjectType())) {
+            if (!ObjectUtils.isEmpty(baseExpert.getVarietyPurchase()) && !baseExpert.getVarietyPurchase().contains(pmDemand.getProjectType())) {
                 throw new Exception("该专家(身份证号：" + baseExpert.getIdNumber() + "）所属采购品种和项目类型不匹配");
+            } else{
+                baseExpert.setVarietyPurchase(pmDemand.getProjectType());
             }
+
             if (ObjectUtils.isEmpty(baseExpert.getCreated())) {
                 baseExpert.setCreated(pmBaseExpertFillReqVo.getCreateBy());
                 baseExpert.setCreateTime(now);