wangli/tyr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
616 Commits 1 Branch 0 Tags 4.3 MiB
fb2ae4928e
Commit Graph

499 Commits

Author SHA1 Message Date
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
TanJ
756bfebe41 fix(1882): select 优化 2023-12-01 10:44:00 +08:00
TanJ
b0048071e7 fix(1882): 添加权限点相关接口 2023-11-30 18:25:15 +08:00
zuoqinbo
96ff41ef79 feat: REQ-1650 2023-11-30 18:19:49 +08:00
zuoqinbo
9e56ef41d6 feat: REQ-1650 2023-11-30 18:00:31 +08:00
zuoqinbo
d78d01180c feat: REQ-1650 2023-11-30 12:03:33 +08:00
zuoqinbo
d252f9f230 feat: REQ-1650 2023-11-30 11:45:21 +08:00
zhansihu
0232279c83 feat(permission): 权限查询支持指定角色 2023-11-27 18:10:49 +08:00
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
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
4dfb9efbf8 feat(role-user): 增加角色用户分页接口 2023-11-14 17:06:59 +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
ea3cf99883 fix(listIdentity): 角色权限增加过滤 2023-11-08 13:38:23 +08:00
zhansihu
c900dce339 fix(listIdentity): 补充查询条件 2023-11-07 17:35:37 +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
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
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
金海洋
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
金海洋
4b27dcf42b listByRoleIds 增加workspace id 2023-10-26 16:42:11 +08:00
zhansihu
bde1848a0f fix(permission-check): path匹配方式 2023-10-26 16:34:15 +08:00
zhansihu
2bbf879f22 fix(permission-check): stream collect 2023-10-26 16:34:10 +08:00
金海洋
71a32c4e74 增加日志 2023-10-26 16:30:05 +08:00
金海洋
3647cc89b0 fix getUsersFromRole newArrayList 2023-10-26 16:30:05 +08:00
zhansihu
636f706bf9 refactor(permission-check): 兼容检查权限为菜单或页面 2023-10-26 15:22:10 +08:00
zhansihu
9136037865 fix(permission-point): 兼容前端返回空列表 2023-10-25 17:51:18 +08:00
zhansihu
761ae92ca3 refactor(permission2identity): 增加返回personalId 2023-10-25 11:00:49 +08:00
金海洋
01735461a2 fix getUsersFromRole newArrayList 2023-10-24 19:28:25 +08:00
金海洋
ad2083d493 fix superAdminList 2023-10-24 17:42:34 +08:00
金海洋
7ddfff8194 修改queryBatchByIdentityIdType 2023-10-24 11:23:57 +08:00
zhansihu
9782249c3e Merge remote-tracking branch 'origin/feature/REQ-1502' into feature/REQ-1502 2023-10-24 10:48:45 +08:00
zhansihu
46e34e0876 feature(permission-query): 修复请求转换 2023-10-24 10:48:39 +08:00
陈维伟
a020b66d8c 调整清洗数据删除老角色逻辑 2023-10-23 20:20:39 +08:00
陈维伟
9c0bb80894 根据身份查询角色信息补充字段:是否包含权限集权限点信息,解决OMS、CMS逻辑矛盾问题 2023-10-23 19:12:38 +08:00
TanJ
10f95a642e feat: 设置默认查权限， 2023-10-23 18:51:22 +08:00
zhansihu
4f7d992a25 feat(product-feature-refresh): 增加任务启动注解 2023-10-23 14:12:08 +08:00
zhansihu
3cd819c85d feat(product-feature-refresh): 产品权限数据清洗任务 2023-10-23 11:46:49 +08:00
zhansihu
ac73698f5f Merge remote-tracking branch 'origin/feature/REQ-1502' into feature/REQ-1502 2023-10-21 17:54:26 +08:00
zhansihu
c122e565d7 refactor(code2identity): 产品权限增加过滤参建类型 2023-10-21 17:54:20 +08:00
wangjibo
2006cd3b18 添加批量接口 2023-10-21 15:57:58 +08:00
wangjibo
ab93553a30 删除单位参与的工作台的所有的人员与角色。 目前主要是用于移除参与单位的地方 2023-10-21 15:54:12 +08:00
wangjibo
e2f692f830 删除超管角色 2023-10-21 15:35:08 +08:00
zhansihu
ce880c2686 fix(code2identity): 处理合并冲突 2023-10-21 15:32:24 +08:00
zhansihu
a47ff15c4a Merge branch 'feature/REQ-1502' of axzsource.com:universal/infrastructure/backend/tyr into feature/REQ-1502 
# Conflicts:
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleUserService.java
 2023-10-21 15:19:32 +08:00
zhansihu
e8fa4686b6 feat(code2identity): 实现批量查询；代码结构调整 2023-10-21 15:15:02 +08:00
wangjibo
bea6d121e1 Merge remote-tracking branch 'origin/feature/REQ-1502' into feature/REQ-1502 2023-10-21 15:02:42 +08:00
wangjibo
63ec1595f3 用户角色接口调整 2023-10-21 15:02:37 +08:00
金海洋
2eb5b95c30 修改 SuperAminInfoResp 2023-10-21 14:59:28 +08:00
金海洋
5080d67322 增加 batchSuperAdminList api 2023-10-21 14:27:40 +08:00