带入相关人员

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java

@@ -94,6 +94,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.mock.web.MockMultipartFile;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -119,6 +120,7 @@ import static com.jero.modules.document.service.impl.BussDocumentLibraryEOServic
  * @Version: V1.0
  */
 @Service
+@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class)
 public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsInventoryEOMapper, ProjectLawsInventoryEO> implements IProjectLawsInventoryEOService {
 
 	@Autowired
@@ -1727,8 +1729,16 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 					//法规清单的责任领域
 					String dutyTerritory = projectLawsInventoryEO.getDutyTerritory();
 					if(StringUtils.isNotBlank(dutyTerritory)){
-						List<ProjectRelatedPersonnel> projectRelatedPersonnelList = projectRelatedPersonnels.stream()
-								.filter(e -> dutyTerritory.contains(e.getDutyTerritory())).collect(Collectors.toList());
+						List<ProjectRelatedPersonnel> projectRelatedPersonnelList = new ArrayList<>();
+						for (String s : dutyTerritory.split(",")) {
+							List<ProjectRelatedPersonnel> projectRelatedPersonnelListTemp  = projectRelatedPersonnels.stream()
+									.filter(e -> s.equals(e.getDutyTerritory())).collect(Collectors.toList());
+							if(projectRelatedPersonnelListTemp.size() != 0){
+								projectRelatedPersonnelList.addAll(projectRelatedPersonnelListTemp);
+							}
+						}
+//						List<ProjectRelatedPersonnel> projectRelatedPersonnelList = projectRelatedPersonnels.stream()
+//								.filter(e -> dutyTerritory.contains(e.getDutyTerritory())).collect(Collectors.toList());
 
 						List<String> lawEngineerList = projectRelatedPersonnelList.stream().map(ProjectRelatedPersonnel::getLawEngineer).distinct().collect(Collectors.toList()).stream().filter(e->StringUtils.isNotBlank(e)).collect(Collectors.toList());
 						List<String> engineeringInterfacePersonList = projectRelatedPersonnelList.stream().map(ProjectRelatedPersonnel::getEngineeringInterfacePerson).distinct().collect(Collectors.toList()).stream().filter(e->StringUtils.isNotBlank(e)).collect(Collectors.toList());