This commit is contained in:
xy
2024-08-14 08:50:20 +08:00
parent a492609b36
commit 7c943244b3
2 changed files with 10 additions and 3 deletions

View File

@@ -136,4 +136,9 @@ public interface OssPath {
*/
String ONLINE_REPORT="onlineReport/";
/**
* 系统上传文件至装置内,文件存储路径
*/
String SYSTEM_TO_DEV="systemToDev/";
}

View File

@@ -290,9 +290,11 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
//fixme 存在web用户和App用户目前先通过管理员的登录名来区分开
} else if (Objects.equals(UserType.ADMINISTRATOR, type) && !Objects.equals(user.getLoginName(), "njcnyw")) {
type = UserType.USER;
} else if (Objects.equals(UserType.ADMINISTRATOR, type) && Objects.equals(user.getLoginName(), "njcnyw")) {
type = UserType.APP;
} else if (Objects.equals(UserType.USER, type) || Objects.equals(UserType.APP, type)) {
}
// else if (Objects.equals(UserType.ADMINISTRATOR, type) && Objects.equals(user.getLoginName(), "njcnyw")) {
// type = UserType.APP;
// }
else if (Objects.equals(UserType.USER, type) || Objects.equals(UserType.APP, type)) {
return page;
}
if (ObjectUtil.isNotNull(queryParam)) {