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

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java

@@ -770,6 +770,16 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
             List<String> studioEngineerUserIdList = projectList.stream().map(ProjectLibraryBase::getStudioEngineer).distinct().collect(Collectors.toList());
             List<SysUser> studioEngineerUserInfo = this.sysUserService.querySysUserListByIdList(studioEngineerUserIdList);
 
+            String allStudioName = "";
+            List<String> allStudioIdList = vprojectVersionList.stream()
+                    .map(VersionVO::getStudio).distinct().collect(Collectors.toList());
+            if(CollectionUtils.isNotEmpty(allStudioIdList)){
+                List<SysUser> allStudioList = this.sysUserService.querySysUserListByIdList(allStudioIdList);
+                List<String> allStudioNameList = allStudioList.stream()
+                        .map(SysUser::getUsername).distinct().collect(Collectors.toList());
+                allStudioName = StringUtils.listToString(allStudioNameList);
+            }
+
             List<ProjectTaskPlanning> projectTaskPlanningList = projectTaskPlanningService.queryList(StringUtils.join(projectVersionList, ","));
             boolean isDisabled = isDisabled();
             for (OtaManageApplyEO manageApplyEO : list) {
@@ -827,7 +837,11 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
                     if (!collect.isEmpty()) {
                         manageApplyEO.setProjectVersionText(collect.get(0).getCar() + "-" + collect.get(0).getYearName() + "-" + collect.get(0).getMarket());
                     }
+                }else{
+                    //没有设置项目版本的情况
+                    manageApplyEO.setStudioText(allStudioName);
                 }
+
                 manageApplyEO.setDisabled(isDisabled || OtaStatusEnum.LOCKED.getKey().equals(manageApplyEO.getMatchStatus()));
                 if (StringUtils.isBlank(manageApplyEO.getRemark())) {
                     manageApplyEO.setRemark("--");