|
@@ -26,7 +26,7 @@ public class MaterialTypeAssignServiceImpl extends MPJBaseServiceImpl<MaterialTy
|
|
|
List<MaterialTypeAssign> materialTypeAssignList = materialTypeMaterialTypeAssignMapper.selectList(Wrappers.<MaterialTypeAssign>query().lambda()
|
|
List<MaterialTypeAssign> materialTypeAssignList = materialTypeMaterialTypeAssignMapper.selectList(Wrappers.<MaterialTypeAssign>query().lambda()
|
|
|
.eq(MaterialTypeAssign::getMaterialTypeId, addMaterialTypeAssignDto.getMaterialTypeId()));
|
|
.eq(MaterialTypeAssign::getMaterialTypeId, addMaterialTypeAssignDto.getMaterialTypeId()));
|
|
|
for (MaterialAssignUserDto addMaterialTypeAssignUserDto : addMaterialTypeAssignDto.getUserList()) {
|
|
for (MaterialAssignUserDto addMaterialTypeAssignUserDto : addMaterialTypeAssignDto.getUserList()) {
|
|
|
- Optional<MaterialTypeAssign> materialTypeAssignAny = materialTypeAssignList.stream().filter(item -> item.getUserId() == addMaterialTypeAssignUserDto.getUserId()).findAny();
|
|
|
|
|
|
|
+ Optional<MaterialTypeAssign> materialTypeAssignAny = materialTypeAssignList.stream().filter(item -> item.getUserId().equals(addMaterialTypeAssignUserDto.getUserId()) ).findAny();
|
|
|
if (!materialTypeAssignAny.isPresent()) {
|
|
if (!materialTypeAssignAny.isPresent()) {
|
|
|
MaterialTypeAssign materialTypeAssign = new MaterialTypeAssign();
|
|
MaterialTypeAssign materialTypeAssign = new MaterialTypeAssign();
|
|
|
materialTypeAssign.setMaterialTypeId(addMaterialTypeAssignDto.getMaterialTypeId());
|
|
materialTypeAssign.setMaterialTypeId(addMaterialTypeAssignDto.getMaterialTypeId());
|