From 5cb52e32521016a0c4ad797fb15c98a434a5ba55 Mon Sep 17 00:00:00 2001
From: chenxudong <chenxudong@cqida.cn>
Date: Mon, 3 Mar 2025 13:40:06 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E9=80=9A=E7=94=A8=E6=88=B7=E5=B7=A5?=
 =?UTF-8?q?=E7=A8=8B=E6=9F=A5=E8=AF=A2=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/serviceimpl/CommonService.java    |  1 -
 .../service/serviceimpl/UserServiceImpl.java  |  3 +-
 electrmangnetic/src/test/java/Test1.java      | 44 +++++++++----------
 3 files changed, 24 insertions(+), 24 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 b4873c7..e1c9748 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
@@ -144,7 +144,6 @@ public class CommonService {
         LambdaQueryWrapper<EdFileInfo> queryWrapper = Wrappers.lambdaQuery(EdFileInfo.class)
                 .eq(EdFileInfo::getEffectFlag, EffectFlagEnum.EFFECT.code)
                 .eq(EdFileInfo::getDataType, EleDataTypeEnum.FOLDER.code)
-                .eq(EdFileInfo::getDataOwn, DataOwnEnum.SYS_PRJ.code)
                 .likeRight(EdFileInfo::getFilePath, id);
         if (dataOwnCode == DataOwnEnum.COMMON.code) {
             queryWrapper.eq(EdFileInfo::getDataOwn, DataOwnEnum.SYS_PRJ.code);
diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/UserServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/UserServiceImpl.java
index 9ec8e11..0a3c2c7 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/UserServiceImpl.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/UserServiceImpl.java
@@ -93,7 +93,8 @@ public class UserServiceImpl implements UserService {
                 || Objects.equals(user.getEffectFlag(), EffectFlagEnum.NOT_EFFECTIVE.code)
         ) {
             return false;
-        } else return user.getInternshipEndDate() == null || !user.getInternshipEndDate().before(now());
+        }
+        return user.getInternshipEndDate() == null || !user.getInternshipEndDate().before(now());
     }
 
     public String createToken(UserLoginInfo loginInfo) {
diff --git a/electrmangnetic/src/test/java/Test1.java b/electrmangnetic/src/test/java/Test1.java
index 951bcc7..61093b8 100644
--- a/electrmangnetic/src/test/java/Test1.java
+++ b/electrmangnetic/src/test/java/Test1.java
@@ -1,22 +1,22 @@
-import com.electromagnetic.industry.software.common.enums.DataOwnEnum;
-import com.electromagnetic.industry.software.common.resp.ElectromagneticResult;
-import com.electromagnetic.industry.software.manage.Application;
-import com.electromagnetic.industry.software.manage.service.EdFileInfoService;
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-
-import javax.annotation.Resource;
-
-@SpringBootTest(classes = Application.class)
-public class Test1 {
-
-    @Resource
-    private EdFileInfoService edFileInfoService;
-
-    @Test
-    public void testFollow() {
-        ElectromagneticResult<?> tree = edFileInfoService.tree(DataOwnEnum.USER_FILE.code);
-        System.out.println("tree = " + tree);
-    }
-
-}
+//import com.electromagnetic.industry.software.common.enums.DataOwnEnum;
+//import com.electromagnetic.industry.software.common.resp.ElectromagneticResult;
+//import com.electromagnetic.industry.software.manage.Application;
+//import com.electromagnetic.industry.software.manage.service.EdFileInfoService;
+//import org.junit.jupiter.api.Test;
+//import org.springframework.boot.test.context.SpringBootTest;
+//
+//import javax.annotation.Resource;
+//
+//@SpringBootTest(classes = Application.class)
+//public class Test1 {
+//
+//    @Resource
+//    private EdFileInfoService edFileInfoService;
+//
+//    @Test
+//    public void testTree() {
+//        ElectromagneticResult<?> tree = edFileInfoService.tree(DataOwnEnum.USER_FILE.code);
+//        System.out.println("tree = " + tree);
+//    }
+//
+//}