From efb061c5ad73d6dbb75084ea5199dd8166a91be7 Mon Sep 17 00:00:00 2001
From: chenxudong <chenxudong@cqida.cn>
Date: Mon, 10 Mar 2025 15:55:41 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=B7=B2=E7=9F=A5=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../software/manage/service/serviceimpl/CommonService.java | 4 +++-
 .../manage/service/serviceimpl/EdFileInfoServiceImpl.java  | 7 +++++--
 .../service/serviceimpl/UserAccessLogServiceImpl.java      | 4 ++++
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/CommonService.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/CommonService.java
index 602d160..ca19b3d 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/CommonService.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/CommonService.java
@@ -192,8 +192,10 @@ public class CommonService {
         if (dataOwnCode == DataOwnEnum.SYS_FILE.code) {
             queryWrapper.eq(EdFileInfo::getDataOwn, DataOwnEnum.SYS_PRJ.code);
             queryWrapper.in(EdFileInfo::getId, accessibleIds);
-        } else {
+        } else if(dataOwnCode == DataOwnEnum.USER_FILE.code){
             queryWrapper.eq(EdFileInfo::getDataOwn, DataOwnEnum.USER_PRJ.code);
+        } else {
+            queryWrapper.eq(EdFileInfo::getDataOwn, DataOwnEnum.REPO_PRJ.code);
         }
         return edFileInfoMapper.selectList(queryWrapper);
     }
diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java
index c4315ff..42d6006 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java
@@ -215,8 +215,11 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
         List<String> strings = map.getOrDefault(querySource, new ArrayList<>());
         List<FileProjectVO> res = new ArrayList<>();
         strings.forEach(e -> {
-            FileProjectVO fileProjectVO = JSONUtil.toList(e, FileProjectVO.class).get(0);
-            res.add(fileProjectVO);
+            List<FileProjectVO> list = JSONUtil.toList(e, FileProjectVO.class);
+            if (CollUtil.isNotEmpty(list)) {
+                FileProjectVO fileProjectVO = list.get(0);
+                res.add(fileProjectVO);
+            }
         });
         res.sort(Comparator.comparing(FileProjectVO::getSort));
         UserThreadLocal.setSuccessInfo("", "", "查询项目层级结构成功");
diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/UserAccessLogServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/UserAccessLogServiceImpl.java
index edb9105..79c87ef 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/UserAccessLogServiceImpl.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/UserAccessLogServiceImpl.java
@@ -1,6 +1,7 @@
 package com.electromagnetic.industry.software.manage.service.serviceimpl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -69,6 +70,9 @@ public class UserAccessLogServiceImpl extends ServiceImpl<UserAccessLogMapper, U
     private void setOtherInfo(List<AccessLogQueryVO> res) {
 
         List<String> userIds = res.stream().map(AccessLogQueryVO::getUserId).collect(Collectors.toList());
+        if (CollUtil.isEmpty(userIds)) {
+            return;
+        }
         LambdaQueryWrapper<User> wrapper = Wrappers.lambdaQuery(User.class).select(User::getUserId, User::getUserName).in(User::getUserId, userIds);
         Map<String, String> idNameMap = userMapper.selectList(wrapper).stream().collect(Collectors.toMap(User::getUserId, User::getUserName));