gitee
/
eiam
mirror of https://gitee.com/topiam/eiam
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

pull/62/head
shao1121353141 2023-09-28 23:36:30 +08:00
parent e5a8f3b0bf 2efef4825d
commit 7ab61954e2
6 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
eiam-common/src/main/java/cn/topiam/employee/common/repository/app/impl/AppGroupRepositoryCustomizedImpl.java
View File

@ -22,8 +22,6 @@ import java.util.List;
import java.util.Map;
import java.util.Objects;
import cn.topiam.employee.common.entity.app.AppEntity;
import cn.topiam.employee.common.repository.app.impl.mapper.AppEntityMapper;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.data.domain.Page;
@ -171,10 +169,10 @@ public class AppGroupRepositoryCustomizedImpl implements AppGroupRepositoryCusto
List<Object> list = Lists.newArrayList();
//当前用户加入的用户组Id
List<Long> groupIdList = userGroupMemberRepository.findByUserId(userId).stream()
.map(UserGroupMemberEntity::getGroupId).toList();
.map(UserGroupMemberEntity::getGroupId).toList();
//当前用户加入的组织id
List<String> orgId = organizationMemberRepository.findAllByUserId(userId).stream()
.map(OrganizationMemberEntity::getOrgId).toList();
.map(OrganizationMemberEntity::getOrgId).toList();
list.addAll(groupIdList);
list.addAll(orgId);
list.add(userId);

4
eiam-common/src/main/java/cn/topiam/employee/common/repository/app/impl/AppRepositoryCustomizedImpl.java
View File

@ -159,10 +159,10 @@ public class AppRepositoryCustomizedImpl implements AppRepositoryCustomized {
List<Object> list = Lists.newArrayList();
//当前用户加入的用户组Id
List<Long> groupIdList = userGroupMemberRepository.findByUserId(userId).stream()
.map(UserGroupMemberEntity::getGroupId).toList();
.map(UserGroupMemberEntity::getGroupId).toList();
//当前用户加入的组织id
List<String> orgId = organizationMemberRepository.findAllByUserId(userId).stream()
.map(OrganizationMemberEntity::getOrgId).toList();
.map(OrganizationMemberEntity::getOrgId).toList();
list.addAll(groupIdList);
list.addAll(orgId);
list.add(userId);

14
eiam-console/src/main/console-fe/package.json
View File

@ -47,9 +47,9 @@
"@ant-design/charts": "^1.4.2",
"@ant-design/icons": "^5.2.6",
"@ant-design/maps": "^1.0.7",
"@ant-design/pro-components": "^2.6.27",
"@ant-design/pro-components": "^2.6.28",
"ahooks": "^3.7.8",
"antd": "^5.9.3",
"antd": "^5.9.4",
"antd-img-crop": "^4.13.0",
"antd-style": "^3.5.0",
"classnames": "^2.3.2",
@ -92,11 +92,11 @@
"@types/lodash": "^4.14.199",
"@types/numeral": "^2.0.3",
"@types/qs": "^6.9.8",
"@types/react": "^18.2.22",
"@types/react-dom": "^18.2.7",
"@types/react-helmet": "^6.1.6",
"@umijs/lint": "^4.0.81",
"@umijs/max": "^4.0.81",
"@types/react": "^18.2.23",
"@types/react-dom": "^18.2.8",
"@types/react-helmet": "^6.1.7",
"@umijs/lint": "^4.0.83",
"@umijs/max": "^4.0.83",
"cross-env": "^7.0.3",
"cross-port-killer": "^1.4.0",
"eslint": "^8.50.0",

4
eiam-console/src/main/console-fe/src/pages/user/Login/locales/zh-CN.ts
View File

@ -29,9 +29,11 @@ export default {
'pages.login.recipient.invalid': '手机号不合法',
'pages.login.captcha.placeholder': '请输入验证码',
'pages.login.captcha.required': '验证码未填写',
'pages.login.phone-login.get-verification-code': '获取验证码',
'pages.login.captcha.success': '获取验证码成功!',
'pages.get-captcha-second-text': '秒后重新获取',
'pages.login.phone.get-opt-code': '获取验证码',
'pages.login.phone.get-opt-code.success': '获取验证码成功',
'pages.login.phone.captcha-second-text': '秒后重新获取',
'pages.login.remember-me': '自动登录',
'pages.login.forgot-password': '忘记密码',
'pages.login.submit': '登录',

2
eiam-console/src/main/java/cn/topiam/employee/console/service/app/impl/AppServiceImpl.java
View File

@ -256,7 +256,7 @@ public class AppServiceImpl implements AppService {
private final AppConverter appConverter;
/**
* AppGroupAssociationRepositorys
* AppGroupAssociationRepository
*/
private final AppGroupAssociationRepository appGroupAssociationRepository;
}

14
eiam-portal/src/main/portal-fe/package.json
View File

@ -48,9 +48,9 @@
"@ant-design/charts": "^1.4.2",
"@ant-design/icons": "^5.2.6",
"@ant-design/maps": "^1.0.7",
"@ant-design/pro-components": "^2.6.27",
"@ant-design/pro-components": "^2.6.28",
"ahooks": "^3.7.8",
"antd": "^5.9.3",
"antd": "^5.9.4",
"antd-img-crop": "^4.13.0",
"antd-style": "^3.5.0",
"classnames": "^2.3.2",
@ -87,11 +87,11 @@
"@types/lodash": "^4.14.199",
"@types/numeral": "^2.0.3",
"@types/qs": "^6.9.8",
"@types/react": "^18.2.22",
"@types/react-dom": "^18.2.7",
"@types/react-helmet": "^6.1.6",
"@umijs/lint": "^4.0.81",
"@umijs/max": "^4.0.81",
"@types/react": "^18.2.23",
"@types/react-dom": "^18.2.8",
"@types/react-helmet": "^6.1.7",
"@umijs/lint": "^4.0.83",
"@umijs/max": "^4.0.83",
"cross-env": "^7.0.3",
"cross-port-killer": "^1.4.0",
"eslint": "^8.50.0",