chenxudong
/
electromagnetic-data-new
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

调通用户工程查询。

This commit is contained in:
chenxudong 2025-03-03 13:40:06 +08:00
parent e506ef262a
commit 5cb52e3252
3 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/CommonService.java
View File

@ -144,7 +144,6 @@ public class CommonService {
LambdaQueryWrapper<EdFileInfo> queryWrapper = Wrappers.lambdaQuery(EdFileInfo.class) LambdaQueryWrapper<EdFileInfo> queryWrapper = Wrappers.lambdaQuery(EdFileInfo.class)
.eq(EdFileInfo::getEffectFlag, EffectFlagEnum.EFFECT.code) .eq(EdFileInfo::getEffectFlag, EffectFlagEnum.EFFECT.code)
.eq(EdFileInfo::getDataType, EleDataTypeEnum.FOLDER.code) .eq(EdFileInfo::getDataType, EleDataTypeEnum.FOLDER.code)
.eq(EdFileInfo::getDataOwn, DataOwnEnum.SYS_PRJ.code)
.likeRight(EdFileInfo::getFilePath, id); .likeRight(EdFileInfo::getFilePath, id);
if (dataOwnCode == DataOwnEnum.COMMON.code) { if (dataOwnCode == DataOwnEnum.COMMON.code) {
queryWrapper.eq(EdFileInfo::getDataOwn, DataOwnEnum.SYS_PRJ.code); queryWrapper.eq(EdFileInfo::getDataOwn, DataOwnEnum.SYS_PRJ.code);

3
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/UserServiceImpl.java
View File

@ -93,7 +93,8 @@ public class UserServiceImpl implements UserService {
|| Objects.equals(user.getEffectFlag(), EffectFlagEnum.NOT_EFFECTIVE.code) || Objects.equals(user.getEffectFlag(), EffectFlagEnum.NOT_EFFECTIVE.code)
) { ) {
return false; return false;
} else return user.getInternshipEndDate() == null || !user.getInternshipEndDate().before(now()); }
return user.getInternshipEndDate() == null || !user.getInternshipEndDate().before(now());
} }
public String createToken(UserLoginInfo loginInfo) { public String createToken(UserLoginInfo loginInfo) {

44
electrmangnetic/src/test/java/Test1.java
View File

@ -1,22 +1,22 @@
import com.electromagnetic.industry.software.common.enums.DataOwnEnum; //import com.electromagnetic.industry.software.common.enums.DataOwnEnum;
import com.electromagnetic.industry.software.common.resp.ElectromagneticResult; //import com.electromagnetic.industry.software.common.resp.ElectromagneticResult;
import com.electromagnetic.industry.software.manage.Application; //import com.electromagnetic.industry.software.manage.Application;
import com.electromagnetic.industry.software.manage.service.EdFileInfoService; //import com.electromagnetic.industry.software.manage.service.EdFileInfoService;
import org.junit.jupiter.api.Test; //import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest; //import org.springframework.boot.test.context.SpringBootTest;
//
import javax.annotation.Resource; //import javax.annotation.Resource;
//
@SpringBootTest(classes = Application.class) //@SpringBootTest(classes = Application.class)
public class Test1 { //public class Test1 {
//
@Resource // @Resource
private EdFileInfoService edFileInfoService; // private EdFileInfoService edFileInfoService;
//
@Test // @Test
public void testFollow() { // public void testTree() {
ElectromagneticResult<?> tree = edFileInfoService.tree(DataOwnEnum.USER_FILE.code); // ElectromagneticResult<?> tree = edFileInfoService.tree(DataOwnEnum.USER_FILE.code);
System.out.println("tree = " + tree); // System.out.println("tree = " + tree);
} // }
//
} //}