Merge remote-tracking branch 'origin/master'

This commit is contained in:
liyawei
2022-06-15 10:03:04 +08:00
@@ -624,8 +624,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
int isProjectRole = Integer.parseInt(projectLawsInventoryEO.getRoleCode());
if(isProjectRole != Integer.parseInt(ProjectRoleEnum.STUDIO_ENGINEER.getValue())
|| isProjectRole != Integer.parseInt(ProjectRoleEnum.MANAGER.getValue())
|| isProjectRole != Integer.parseInt(ProjectRoleEnum.ADMIN.getValue())){
&& isProjectRole != Integer.parseInt(ProjectRoleEnum.MANAGER.getValue())
&& isProjectRole != Integer.parseInt(ProjectRoleEnum.ADMIN.getValue())){
projectLawsInventoryEOQueryWrapper.and(queryWrapper ->{
queryWrapper.eq("regulation_owner_id",currentUser.getId()).
or().eq("homologation_engineer_id",currentUser.getId());