Commit Graph

502 Commits

Author SHA1 Message Date
zuoqinbo
9aeb17c480 feat: REQ-1650 角色ID查询人员列表 2023-11-25 15:21:43 +08:00
zuoqinbo
d9d582b117 feat:账户变更记录 2023-11-24 09:50:29 +08:00
zuoqinbo
04c50e6fbd Merge remote-tracking branch 'origin/dev' into dev 2023-11-23 19:00:10 +08:00
zuoqinbo
f04357f279 feat:账户变更记录 2023-11-23 18:59:49 +08:00
TanJ
3fb08ce52f Merge remote-tracking branch 'origin/feature/REQ-1609' into dev 2023-11-23 16:54:22 +08:00
TanJ
7f5bc29ce1 fix(1609): 接口命名BUG 2023-11-23 16:53:00 +08:00
zhansihu
1cdbf9acaf Merge remote-tracking branch 'origin/feature/REQ-1609' into dev
# Conflicts:
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasRoleUserRelationServiceImpl.java
2023-11-21 17:13:06 +08:00
zhansihu
e1177f20e8 feat(flow): 增加支持多ou和workspace 2023-11-21 17:11:02 +08:00
TanJ
5e02894336 Merge branch 'feature/REQ-1609' into dev 2023-11-16 17:09:34 +08:00
TanJ
0c69e67c09 feat(1609): 工作台查询角色 2023-11-16 17:09:04 +08:00
zhansihu
ebd693a781 feat(base-dict): 字典参数描述 2023-11-15 17:22:05 +08:00
zhansihu
775f19b682 Merge remote-tracking branch 'origin/feature/REQ-1609' into dev 2023-11-15 14:02:46 +08:00
zhansihu
eb0fa082eb feat(base-dict): 增加字典类型 2023-11-15 14:01:23 +08:00
zhansihu
39aad1f205 Merge remote-tracking branch 'origin/feature/REQ-1289' into dev 2023-11-14 17:09:12 +08:00
zhansihu
4dfb9efbf8 feat(role-user): 增加角色用户分页接口 2023-11-14 17:06:59 +08:00
展思虎
1303dc0f8c Merge branch 'bug/BUG-7071' into 'master'
Bug/bug 7071

See merge request universal/infrastructure/backend/tyr!11
2023-11-13 10:05:25 +00:00
zhansihu
9a0cb573e3 Merge remote-tracking branch 'origin/bug/BUG-7071' into dev 2023-11-13 17:19:32 +08:00
zhansihu
666b9344b7 refactor(listIdentity): 线程池命名 2023-11-13 17:08:11 +08:00
zhansihu
39a89c9f22 refactor(listIdentity): 线程池命名 2023-11-13 16:29:24 +08:00
zhansihu
a354d44b39 refactor(listIdentity): 调整计时;trace跨线程 2023-11-13 16:13:58 +08:00
zhansihu
54b2ecf030 refactor(listIdentity): 时间分段 2023-11-13 14:07:57 +08:00
zhansihu
fbc10c2323 refactor(listIdentity): 时间分段 2023-11-13 14:07:00 +08:00
zhansihu
390ae73f50 refactor(listIdentity): 增加stopwatch;调整线程池 2023-11-13 13:49:19 +08:00
zhansihu
66327320a9 refactor(listIdentity): 增加stopwatch;调整线程池 2023-11-13 11:06:27 +08:00
金海洋
5918b1b308 修复错误的权限码也能查到人 2023-11-10 10:58:34 +08:00
zhansihu
c7260e39f0 Merge branch 'hotfix/FIX-631' into dev 2023-11-08 16:41:20 +08:00
展思虎
431f1fc56e Merge branch 'hotfix/FIX-631' into 'master'
fix(listIdentity): 角色权限增加过滤

See merge request universal/infrastructure/backend/tyr!10
2023-11-08 05:39:29 +00:00
zhansihu
ea3cf99883 fix(listIdentity): 角色权限增加过滤 2023-11-08 13:38:23 +08:00
zhansihu
5d6258f4e3 Merge branch 'hotfix/FIX-629' into dev 2023-11-07 18:32:49 +08:00
展思虎
d698fbb096 Merge branch 'hotfix/FIX-629' into 'master'
fix(listIdentity): 补充查询条件

See merge request universal/infrastructure/backend/tyr!9
2023-11-07 09:41:11 +00:00
zhansihu
c900dce339 fix(listIdentity): 补充查询条件 2023-11-07 17:35:37 +08:00
金海洋
916b9c5ee3 Merge branch 'hotfix/FIX-629' into 'master'
Hotfix/fix 629

See merge request universal/infrastructure/backend/tyr!8
2023-11-06 07:56:03 +00:00
zhansihu
f49f42fea9 Merge branch 'fix/FIX-20131102' into dev
# Conflicts:
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/TyrSaasAuthServiceImpl.java
2023-11-03 14:34:46 +08:00
zhansihu
aa2a098e78 refactor(permission-tree): 增加支持是否过滤子节点 2023-11-03 12:04:18 +08:00
zhansihu
1227e0a94f refactor(permission-tree): 增加支持是否过滤子节点 2023-11-03 11:52:43 +08:00
zhansihu
3872f8cd00 refactor(permission-check): 优化日志+1 2023-11-03 10:09:30 +08:00
zhansihu
f240176451 refactor(permission-check): 优化日志 2023-11-03 09:42:22 +08:00
zhansihu
96d616afd0 refactor(permission-check): 优化日志;产品权限过滤 2023-11-03 09:38:34 +08:00
金海洋
8192fec015 Merge branch 'feature/REQ-1502' into dev 2023-10-30 19:46:55 +08:00
金海洋
135acb19b5 Merge branch 'feature/REQ-1502' into 'master'
Feature/req 1502

See merge request universal/infrastructure/backend/tyr!7
2023-10-30 08:49:16 +00:00
wangjibo
ccdbeeee24 Merge remote-tracking branch 'origin/dev' into dev 2023-10-30 16:22:08 +08:00
wangjibo
152bca134e Merge branch 'feature/REQ-1502' into dev
# Conflicts:
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/TyrSaasAuthServiceImpl.java
2023-10-30 16:22:00 +08:00
wangjibo
7dcf7a670c Merge remote-tracking branch 'origin/feature/REQ-1502' into feature/REQ-1502 2023-10-30 16:16:56 +08:00
wangjibo
aaf42d7694 修改角色问题修复
1.只有超管的情况下,会导致将超管角色替换
2023-10-30 16:16:51 +08:00
陈维伟
74545ff496 CMS角色清洗job-将回溯不了的角色洗成其他 2023-10-27 19:29:18 +08:00
金海洋
b8f4b5d260 review log 2023-10-27 09:38:07 +08:00
金海洋
65478bfd36 add log 2023-10-26 18:19:26 +08:00
zhansihu
0b0b33169a Merge remote-tracking branch 'origin/feature/REQ-1502' into feature/REQ-1502 2023-10-26 18:10:47 +08:00
zhansihu
13dc89cff8 debug(permission-check): log 2023-10-26 18:10:40 +08:00
金海洋
010d16c495 listByRoleIds 增加workspace id 2023-10-26 18:06:32 +08:00