zhansihu
|
86dcb10442
|
Merge remote-tracking branch 'origin/master' into feature/REQ-2046
# Conflicts:
# tyr-api/src/main/java/cn/axzo/tyr/client/feign/TyrSaasAuthApi.java
# tyr-server/src/main/java/cn/axzo/tyr/server/controller/auth/TyrSaasAuthController.java
# tyr-server/src/main/java/cn/axzo/tyr/server/service/RoleService.java
# tyr-server/src/main/java/cn/axzo/tyr/server/service/TyrSaasAuthService.java
# tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/PermissionPointServiceImpl.java
# tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleServiceImpl.java
# tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/TyrSaasAuthServiceImpl.java
|
2024-02-01 10:05:42 +08:00 |
|
zhansihu
|
cc703294fc
|
Merge remote-tracking branch 'origin/feature/REQ-2046' into feature/REQ-2046
|
2024-01-31 19:59:32 +08:00 |
|
zhansihu
|
a9c9c00bf6
|
feat(2046-feature): 调整parent id处理逻辑
|
2024-01-31 19:59:25 +08:00 |
|
金海洋
|
36ff74574d
|
/api/saas-role-user/list 增加personId的参数
|
2024-01-31 19:22:26 +08:00 |
|
zhansihu
|
9645a48518
|
feat(2046-feature): 调整parent id检查逻辑
|
2024-01-31 18:13:05 +08:00 |
|
zhansihu
|
dfbd7eb1c1
|
feat(2046-feature): 调整parent id
|
2024-01-31 17:58:51 +08:00 |
|
zhansihu
|
2e6112056a
|
feat(2046-feature): 调整判断逻辑
|
2024-01-31 17:29:01 +08:00 |
|
zhansihu
|
b785f2605d
|
Merge remote-tracking branch 'origin/feature/REQ-2046' into feature/REQ-2046
|
2024-01-31 17:13:12 +08:00 |
|
zhansihu
|
e12d8aff94
|
feat(2046-feature): feature path和parent处理更新
|
2024-01-31 17:13:06 +08:00 |
|
luofu
|
ed07a887df
|
Merge branch 'feature/REQ-2046' of axzsource.com:universal/infrastructure/backend/tyr into feature/REQ-2046
|
2024-01-31 16:14:53 +08:00 |
|
luofu
|
3dbfb14078
|
feat(REQ-2046): 新增通过appItemId查询featureId的接口
|
2024-01-31 16:14:48 +08:00 |
|
zhansihu
|
3168b86286
|
Merge remote-tracking branch 'origin/feature/REQ-2046' into feature/REQ-2046
|
2024-01-31 15:31:01 +08:00 |
|
zhansihu
|
713024e30b
|
feat(2046-feature): 增加saas feature path检查处理任务
|
2024-01-31 15:30:55 +08:00 |
|
TanJ
|
c3211f3916
|
fix 角色ID冲突解决
|
2024-01-30 18:32:15 +08:00 |
|
zhansihu
|
1205323b3d
|
feat(2046-permission): 普通角色权限处理跳过管理员
|
2024-01-30 10:34:07 +08:00 |
|
TanJ
|
7517fa9029
|
feat(2046) 逻辑调整 ，未获取到工作台类型时也不阻塞超管创建
|
2024-01-27 16:01:28 +08:00 |
|
TanJ
|
018e79b65c
|
feat(2046) 创建超管设置product type
|
2024-01-27 15:54:36 +08:00 |
|
zhansihu
|
120d9e0952
|
feat(2046-permission): 去重ou workspace对
|
2024-01-27 11:05:43 +08:00 |
|
zhansihu
|
fb2ae4928e
|
feat(2046-permission): 权限查询综合管理和普通角色
|
2024-01-26 18:13:41 +08:00 |
|
zhansihu
|
38ca0a3d3a
|
refactor(2046-permission): 取消参数必传
|
2024-01-25 10:17:59 +08:00 |
|
zhansihu
|
2e31cd332c
|
Merge remote-tracking branch 'origin/feature/REQ-2046' into feature/REQ-2046
|
2024-01-24 14:46:12 +08:00 |
|
zhansihu
|
3aeae4fbf9
|
refactor(2046-permission): 查询角色时不限制标签
|
2024-01-24 14:46:04 +08:00 |
|
chenwenjian
|
3404aac3c5
|
feat(REQ-2046): 调整通过categoryCode查询角色分组
接口：cn.axzo.tyr.server.service.impl.RoleServiceImpl#queryByCategoryCode
|
2024-01-24 14:40:41 +08:00 |
|
TanJ
|
77db7b6531
|
feat(2046) 权限过滤接口调整
|
2024-01-23 18:11:18 +08:00 |
|
zhansihu
|
f864fbe6e9
|
feat(2046-permission): 小组类型按班组类型处理
|
2024-01-23 12:01:00 +08:00 |
|
zhansihu
|
716034a1ca
|
feat(2046-permission): 兼容角色标签逻辑
|
2024-01-22 15:52:40 +08:00 |
|
zhansihu
|
9ab6d8b063
|
Merge branch 'feature/REQ-2046-zhan' into feature/REQ-2046
# Conflicts:
# tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/TyrSaasAuthServiceImpl.java
|
2024-01-22 10:08:19 +08:00 |
|
TanJ
|
be152b85cf
|
feat(2046) 标准角过滤逻辑调整
|
2024-01-21 16:38:02 +08:00 |
|
TanJ
|
f966ac2d2c
|
feat(2046) findByRoleIds
|
2024-01-21 15:09:34 +08:00 |
|
henry
|
b093f77ab5
|
REQ-2046 小组长role fix
|
2024-01-20 14:03:14 +08:00 |
|
henry
|
6521695b65
|
REQ-2046 小组长role fix
|
2024-01-20 14:01:40 +08:00 |
|
TanJ
|
8761137a56
|
feat(2046) fix admin role
|
2024-01-20 11:11:32 +08:00 |
|
zuoqinbo
|
6b6125f245
|
feat:REQ-2046 personId查询角色信息
|
2024-01-20 10:31:57 +08:00 |
|
zhansihu
|
972463c3b6
|
feat(2046-authPermission): 权限检查支持person id
|
2024-01-19 18:28:03 +08:00 |
|
zhansihu
|
c561014362
|
fix(2046-permission-cache): 增加配置刷新
|
2024-01-18 15:24:46 +08:00 |
|
zhansihu
|
f3fd1ea4a4
|
fix(auth): remove log
|
2024-01-17 15:39:35 +08:00 |
|
zhansihu
|
113ad0eb43
|
fix(auth): 修复SQL查询
|
2024-01-17 15:15:27 +08:00 |
|
zhansihu
|
e5e0c2463b
|
fix(auth): 调整接口定义
|
2024-01-17 14:36:01 +08:00 |
|
zhansihu
|
e0027297c7
|
fix(auth): 增加接口在项目部下权限查人
|
2024-01-17 13:40:57 +08:00 |
|
yangheng
|
9434a08596
|
Merge branch 'feature/REQ-2046-yh' into 'feature/REQ-2046'
REQ-2039 enum fix
See merge request universal/infrastructure/backend/tyr!19
|
2024-01-16 09:27:15 +00:00 |
|
henry
|
842cb87fa5
|
REQ-2039 enum fix
|
2024-01-16 17:25:11 +08:00 |
|
TanJ
|
5d6bb2ed85
|
Merge remote-tracking branch 'origin/feature/REQ-2046' into feature/REQ-2046
|
2024-01-16 17:08:13 +08:00 |
|
TanJ
|
31360227d7
|
feat(2046) fix 查询工人体系角色bug修复
|
2024-01-16 17:08:07 +08:00 |
|
吕绍华
|
622bd71c79
|
Merge branch 'feature/REQ-2046-yh' into 'feature/REQ-2046'
REQ-2039 RPC 小组长
See merge request universal/infrastructure/backend/tyr!18
|
2024-01-16 08:50:40 +00:00 |
|
henry
|
633e150b8c
|
REQ-2039 RPC 小组长
|
2024-01-16 16:41:16 +08:00 |
|
TanJ
|
7c7c6bc852
|
Merge remote-tracking branch 'origin/feature/REQ-2046' into feature/REQ-2046
|
2024-01-16 15:56:07 +08:00 |
|
TanJ
|
9c558f8d84
|
feat(2046) fix 去除角色bug
|
2024-01-16 15:55:38 +08:00 |
|
wangjibo
|
56a265a8fb
|
Merge remote-tracking branch 'origin/feature/REQ-2046' into feature/REQ-2046
|
2024-01-16 14:36:10 +08:00 |
|
wangjibo
|
5713d452b7
|
删除班组长角色时添加is—delete过滤
|
2024-01-16 14:36:02 +08:00 |
|
TanJ
|
d617917e45
|
feat(2046) fix 设置角色时，使用group id查询
|
2024-01-16 11:44:19 +08:00 |
|