项目管理

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

@@ -776,7 +776,10 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
             throw new Exception("参数错误");
         }
         List<BaseExpert> baseExpertList = pmBaseExpertFillReqVo.getBaseExpertList();
-        List<PmDemandExpertRef> pmDemandExpertRefList = new ArrayList<>();
+        if(ObjectUtils.isEmpty(baseExpertList)){
+            throw new Exception("参数错误");
+        }
+
         Date now = new Date();
         for (BaseExpert baseExpert : baseExpertList) {
             if(NameListType.BLACK.getCode().equals(baseExpert.getStatus())){
@@ -798,30 +801,28 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
                 baseExpert.setUpdated(pmBaseExpertFillReqVo.getUpdateBy());
                 baseExpert.setUpdateTime(now);
             }
-
-            LambdaQueryWrapper<PmDemandExpertRef> pmDemandExpertRefLambdaQueryWrapper = new LambdaQueryWrapper<>();
-            pmDemandExpertRefLambdaQueryWrapper.eq(PmDemandExpertRef::getDemandId,pmDemand.getDemandId())
-                    .eq(PmDemandExpertRef::getExpertId,baseExpert.getId().longValue())
-                    .eq(PmDemandExpertRef::getAccessTime,pmBaseExpertFillReqVo.getAccessTime());
-            PmDemandExpertRef pmDemandExpertRef =  pmDemandExpertRefService.getOne(pmDemandExpertRefLambdaQueryWrapper);
-            if(pmDemandExpertRef == null){
-                pmDemandExpertRef = new PmDemandExpertRef();
-                pmDemandExpertRef.setCreateBy(pmBaseExpertFillReqVo.getCreateBy());
-                pmDemandExpertRef.setCreateTime(now);
+            if(baseExpertService.saveOrUpdate(baseExpert)){
+                LambdaQueryWrapper<PmDemandExpertRef> pmDemandExpertRefLambdaQueryWrapper = new LambdaQueryWrapper<>();
+                pmDemandExpertRefLambdaQueryWrapper.eq(PmDemandExpertRef::getDemandId,pmDemand.getDemandId())
+                        .eq(PmDemandExpertRef::getExpertId,baseExpert.getId().longValue())
+                        .eq(PmDemandExpertRef::getAccessTime,pmBaseExpertFillReqVo.getAccessTime());
+                PmDemandExpertRef pmDemandExpertRef =  pmDemandExpertRefService.getOne(pmDemandExpertRefLambdaQueryWrapper);
+                if(pmDemandExpertRef == null){
+                    pmDemandExpertRef = new PmDemandExpertRef();
+                    pmDemandExpertRef.setCreateBy(pmBaseExpertFillReqVo.getCreateBy());
+                    pmDemandExpertRef.setCreateTime(now);
+                }
+                pmDemandExpertRef.setDemandId(pmDemand.getDemandId());
+                pmDemandExpertRef.setExpertId(baseExpert.getId().longValue());
+                pmDemandExpertRef.setAccessTime(DateUtils.parseDate(pmBaseExpertFillReqVo.getAccessTime()));
+                pmDemandExpertRef.setUpdateBy(pmBaseExpertFillReqVo.getCreateBy());
+                pmDemandExpertRef.setUpdateTime(pmDemandExpertRef.getCreateTime());
+                pmDemandExpertRefService.saveOrUpdate(pmDemandExpertRef);
             }
-            pmDemandExpertRef.setDemandId(pmDemand.getDemandId());
-            pmDemandExpertRef.setExpertId(baseExpert.getId().longValue());
-            pmDemandExpertRef.setAccessTime(DateUtils.parseDate(pmBaseExpertFillReqVo.getAccessTime()));
-            pmDemandExpertRef.setUpdateBy(pmBaseExpertFillReqVo.getCreateBy());
-            pmDemandExpertRef.setUpdateTime(pmDemandExpertRef.getCreateTime());
-            pmDemandExpertRefList.add(pmDemandExpertRef);
+
         }
 
-          if (baseExpertService.saveOrUpdateBatch(baseExpertList)){
-              return pmDemandExpertRefService.saveOrUpdateBatch(pmDemandExpertRefList);
-          } else {
-              return false;
-          }
+         return true;
     }
 
     @Override