Merge branch 'develop' of http://139.196.179.195:3000/chenxudong/electromagnetic-data-new into develop

-文件详情增加标签信息
-增加库数据标识

electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java

@@ -151,7 +151,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
             if (fileIdsWithTags.isEmpty()) {
                 return ElectromagneticResultUtil.success(new RespPageVO<>(0, new ArrayList<>()));
             }
-            queryWrapper.in(EdFileInfo::getId, fileIdsWithTags);
+            queryWrapper.in(EdFileInfo::getFileId, fileIdsWithTags);
         }
 
         Page<EdFileInfo> edFileInfoPage = this.baseMapper.selectPage(new Page<>(pars.getPageNum(), pars.getPageSize()), queryWrapper);
@@ -160,7 +160,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
         records.forEach(e -> {
             e.setFileSizeShow(EleCommonUtil.convertFileSize(e.getFileSize()));
             e.setIsFavorite(isFavorite(UserThreadLocal.getUserId(), e.getId()) ? 1 : 0);
-            e.setLabels(fileTagRelationService.getFileTags(e.getId()));
+            e.setLabels(fileTagRelationService.getFileTags(e.getFileId()));
         });
         UserThreadLocal.setSuccessInfo("", "", "查询文件成功");
         return ElectromagneticResultUtil.success(new RespPageVO<>(total, records));
@@ -1077,6 +1077,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
         User singleUser = userMapper.getSingleUser(fileInfo.getCreatedBy());
         fileInfo.setCreatedBy(singleUser.getUserName());
         FileInfoVO fileInfoVO = BeanUtil.copyProperties(fileInfo, FileInfoVO.class);
+        fileInfoVO.setLabels(fileTagRelationService.getFileTags(fileInfo.getFileId()));
         UserThreadLocal.setSuccessInfo(fileInfo.getParentId(), id, "查询了文件的详细信息");
         return ElectromagneticResultUtil.success(fileInfoVO);
     }
@@ -1463,7 +1464,13 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
         fileInfoVOIPage.getRecords().forEach(e -> {
             e.setFileSizeShow(EleCommonUtil.convertFileSize(e.getFileSize()));
             e.setIsFavorite(isFavorite(UserThreadLocal.getUserId(), e.getId()) ? 1 : 0);
-            e.setIsPersonal((String.valueOf(DataOwnEnum.USER_FILE.code).equals(e.getDataOwn()) && Objects.equals(e.getCreatedBy(), UserThreadLocal.getUserId())) ? 1 : 0);
+            if (String.valueOf(DataOwnEnum.REPO_FILE.code).equals(e.getDataOwn())) {
+                e.setIsPersonal(2);
+            } else if (String.valueOf(DataOwnEnum.USER_FILE.code).equals(e.getDataOwn()) && Objects.equals(e.getCreatedBy(), UserThreadLocal.getUserId())) {
+                e.setIsPersonal(1);
+            } else {
+                e.setIsPersonal(0);
+            }
             // 设置权限
             Map<String, Boolean> permissions = (e.getIsPersonal() == 1)
                     ? permissionService.getPersonalPermission()