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 |
|
TanJ
|
a897771bf3
|
feat(2046) 添加通过角色分组Code查询标准角色接口
|
2024-01-13 18:39:09 +08:00 |
|
TanJ
|
aef8a7778e
|
feat(2046) 修改批量获取权限分组接口
|
2024-01-13 17:41:48 +08:00 |
|
TanJ
|
fb29af7950
|
feat(2046) 班组管理员、代班长设置权限接口调整
|
2024-01-13 11:47:48 +08:00 |
|
wangjibo
|
031132e5bf
|
teamOuId 平台班组id
|
2024-01-11 09:37:42 +08:00 |
|
TanJ
|
e76ded018d
|
feat(2046) 班组管理员添加支持批量设置与清除
|
2024-01-10 10:49:52 +08:00 |
|
TanJ
|
e432ed7260
|
feat(2046) 班组管理员相关权限添加批量取消授权功能
|
2024-01-09 18:51:41 +08:00 |
|
TanJ
|
673f7a7397
|
feat(2046) 添加班组管理员、代班长、查询 权限信息
|
2024-01-09 17:28:32 +08:00 |
|
zhansihu
|
6ea662e253
|
refactor(permission): 重构人员权限查询
|
2024-01-09 16:03:35 +08:00 |
|
TanJ
|
abe02d21b8
|
feat(2046) 添加班组管理员、代班长、查询 权限信息
|
2024-01-08 14:55:45 +08:00 |
|
TanJ
|
4b1d49f1a9
|
Merge remote-tracking branch 'origin/feature/REQ-2046' into feature/REQ-2046
|
2024-01-05 16:17:08 +08:00 |
|
TanJ
|
48837ebf65
|
feat(2046) 添加班组管理员、代班长、基于权限分类和资源ID查询逻辑
|
2024-01-05 16:16:48 +08:00 |
|
zhansihu
|
2dbe9590ed
|
fix(permission): 权限请求默认使用缓存
|
2024-01-05 14:50:25 +08:00 |
|
zhansihu
|
6b26fdc923
|
fix(permission): 修复权限点查询
|
2024-01-05 14:31:02 +08:00 |
|
zhansihu
|
e668fbbd6b
|
fix(permission): 权限点查询增加path
|
2024-01-05 11:56:05 +08:00 |
|
wangjibo
|
a6d7dfd76e
|
Merge branch 'feature/REQ-2046-wangjibo' into feature/REQ-2046
|
2024-01-04 16:28:18 +08:00 |
|
wangjibo
|
81c09770d3
|
1.授权或者取消授权平台班组长和项目内班组长角色
2.oms 预设角色管理 添加 productRoleType 字段
|
2024-01-04 16:22:54 +08:00 |
|
zhansihu
|
fc1f1d082b
|
fix(permission): 权限缓存测试修复
|
2024-01-04 15:00:38 +08:00 |
|
zhansihu
|
26cee3d6b5
|
refactor(permission): 权限缓存统一处理；增加暂时禁用处理逻辑和接口
|
2024-01-04 11:45:36 +08:00 |
|
zhansihu
|
9502c353a8
|
refactor(permission): 调整缓存处理
|
2024-01-03 17:14:22 +08:00 |
|
zhansihu
|
5884bd1edc
|
feat(permission): 增加person查询权限;重构权限点查询
|
2024-01-03 15:43:50 +08:00 |
|
zhansihu
|
5f9bf8f710
|
refactor(permission): 增加权限缓存开关，调整默认值
|
2024-01-02 17:47:54 +08:00 |
|
陈维伟
|
569ab9ceac
|
实现逻辑:
编辑人员角色时底层API取出过滤逻辑,放到业务逻辑中
|
2023-12-28 18:54:45 +08:00 |
|
zhansihu
|
f482b0370f
|
refactor(permission): 调整缓存逻辑，过滤逻辑
|
2023-12-26 17:58:26 +08:00 |
|
zhansihu
|
d061dbad4d
|
refactor(permission): 授权查询缓存
|
2023-12-26 17:10:12 +08:00 |
|
谭杰
|
0ac6eecde7
|
Merge branch 'feature/TJ_permission_menu' into 'master'
Feature/tj permission menu
See merge request universal/infrastructure/backend/tyr!16
|
2023-12-20 09:18:41 +00:00 |
|
陈维伟
|
829c8759c6
|
fix @value map
|
2023-12-18 21:16:45 +08:00 |
|
陈维伟
|
71efe48d34
|
解决冲突
|
2023-12-18 20:45:02 +08:00 |
|
陈维伟
|
4fd8f32f59
|
Merge remote-tracking branch 'origin/master' into feature/REQ-1696
# Conflicts:
# tyr-api/src/main/java/cn/axzo/tyr/client/feign/TyrSaasRoleUserApi.java
# tyr-server/src/main/java/cn/axzo/tyr/server/controller/roleuser/RoleUserController.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/RoleUserService.java
|
2023-12-18 20:40:15 +08:00 |
|
陈维伟
|
14194fe6a4
|
实现逻辑:
获取分包负责人等特殊角色
|
2023-12-18 18:48:07 +08:00 |
|
陈维伟
|
565ea4d70b
|
实现逻辑:
查询角色通用接口添加查询逻辑是否包含分包负责人等特殊角色
|
2023-12-18 14:16:28 +08:00 |
|
陈维伟
|
986ba31968
|
更新角色时排除分包负责人等角色
|
2023-12-18 11:49:29 +08:00 |
|
zuoqinbo
|
955002f698
|
bugfix(REQ-1650): 修复无法正确删除角色问题
|
2023-12-11 20:40:00 +08:00 |
|
zuoqinbo
|
f88b8ab8c0
|
bugfix(REQ-1650): 修复无法正确删除角色问题
|
2023-12-11 17:05:20 +08:00 |
|
zuoqinbo
|
e9a0bba204
|
bugfix(REQ-1650): 修复无法正确删除角色问题
|
2023-12-11 16:42:17 +08:00 |
|
zuoqinbo
|
cf2d17b0c6
|
bugfix(REQ-1650): 修复无法正确删除角色问题
|
2023-12-11 11:33:16 +08:00 |
|
陈维伟
|
58bca9dac5
|
fix bug:查询产品列表新增授权类型条件
|
2023-12-09 16:52:00 +08:00 |
|
zuoqinbo
|
f839fd406c
|
bugfix: 修复无法正确删除角色问题
|
2023-12-08 17:41:33 +08:00 |
|
zuoqinbo
|
f2fee86067
|
bugfix: 修复无法正确删除角色问题
|
2023-12-07 16:14:18 +08:00 |
|
陈维伟
|
a88681cd70
|
fix bug:查询产品列表SQL拼接问题
|
2023-12-07 15:50:57 +08:00 |
|
zuoqinbo
|
e15bad7def
|
bugfix: 修复无法正确删除角色问题
|
2023-12-07 15:18:58 +08:00 |
|
zuoqinbo
|
438d322b84
|
bugfix: 修复无法正确删除角色问题
|
2023-12-07 10:18:36 +08:00 |
|
zuoqinbo
|
5e70300272
|
bugfix: 修复无法正确删除角色问题
|
2023-12-06 20:30:58 +08:00 |
|
zuoqinbo
|
23f42e94ec
|
bugfix: 修复无法正确删除角色问题
|
2023-12-06 20:29:54 +08:00 |
|
zuoqinbo
|
6533a0a3c0
|
bugfix: 修复无法正确添加角色问题
|
2023-12-06 18:41:44 +08:00 |
|
zuoqinbo
|
0037e2e8e8
|
feat: REQ-1650 角色名称校验
|
2023-12-06 17:39:40 +08:00 |
|
zuoqinbo
|
1e5991c88a
|
feat: REQ-1650 角色名称校验
|
2023-12-06 17:13:33 +08:00 |
|
陈维伟
|
526564e253
|
实现接口:
删除用户角色关联关系接口
|
2023-12-06 16:20:33 +08:00 |
|
陈维伟
|
5e470575a3
|
实现逻辑:
查询产品详情
代码重构
|
2023-12-05 14:08:43 +08:00 |
|
陈维伟
|
08619a8f5e
|
实现逻辑:
查询产品列表
新增产品
更新产品
|
2023-12-05 11:34:16 +08:00 |
|
zuoqinbo
|
02537e43d4
|
feat: REQ-1650
|
2023-12-05 10:24:32 +08:00 |
|
TanJ
|
04dbfed2cc
|
fix : enum 查询问题
|
2023-12-01 16:11:44 +08:00 |
|
zuoqinbo
|
1a8cdc41ee
|
Merge remote-tracking branch 'origin/feature/REQ-1650' into feature/REQ-1650
|
2023-12-01 15:40:35 +08:00 |
|
zuoqinbo
|
b6f800691f
|
feat: REQ-1650
|
2023-12-01 15:40:12 +08:00 |
|
TanJ
|
b50725a9c1
|
fix : 角色查询bug
|
2023-12-01 15:30:28 +08:00 |
|
zuoqinbo
|
495e026157
|
feat: REQ-1650
|
2023-12-01 11:23:55 +08:00 |
|
TanJ
|
2da3b5a452
|
feat: 参数调整
|
2023-12-01 11:21:25 +08:00 |
|