Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH

This commit is contained in:
zyx.net
2023-04-07 15:37:41 +08:00
@@ -614,6 +614,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
if(allList.size()>0){ if(allList.size()>0){
for(String allDuty : allDutyList){ for(String allDuty : allDutyList){
String dutyPerson = allDuty; String dutyPerson = allDuty;
if(!StringUtils.isEmpty(dutyPerson)){
if(!allList.contains(dutyPerson)){ if(!allList.contains(dutyPerson)){
if(roleCode1.equals(com.jero.modules.project.enums.ProjectRoleEnum.STUDIO_ENGINEER.getValue())){ if(roleCode1.equals(com.jero.modules.project.enums.ProjectRoleEnum.STUDIO_ENGINEER.getValue())){
if(relatedPersonnel.getEngineeringInterfacePerson() != null){ if(relatedPersonnel.getEngineeringInterfacePerson() != null){
@@ -639,7 +640,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
} }
} }
} }
}
} }
} }