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

708 Commits

Author SHA1 Message Date
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
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
wangjibo
f26036f652 角色接口调整，删除重复api接口 2023-10-21 14:23:53 +08:00
zhansihu
2a3132b665 Merge remote-tracking branch 'origin/feature/REQ-1502' into feature/REQ-1502 2023-10-21 14:10:11 +08:00
zhansihu
7bee500ca2 feat(code2identity): 实现权限查人接口 2023-10-21 14:09:57 +08:00
陈维伟
ee9e6af1db CMS数据清洗优先处理角色、角色分组、用户角色关联关系,避免出现其他角色没有权限点直接跳过的情况 2023-10-21 14:07:52 +08:00
金海洋
c0165d17a2 增加 batchSuperAdminList api 2023-10-21 12:54:03 +08:00
张弘昊
f7380df0ec 请求参数加上builder 2023-10-20 17:54:20 +08:00
陈维伟
9b18ac15c8 根据id查询角色详情默认返回权限信息 2023-10-20 16:26:41 +08:00
金海洋
e3d92f404f feat(server): 修改查询企业工作台超级管理员 2023-10-20 15:41:59 +08:00
金海洋
34481efaa5 feat(server): 修改查询企业工作台超级管理员 2023-10-20 15:41:57 +08:00
陈维伟
ad6fa56c25 Merge remote-tracking branch 'origin/feature/REQ-1502' into feature/REQ-1502 2023-10-20 14:08:23 +08:00
陈维伟
7d0e7d68fd 查询角色信息通用接口默认不返回角色下的权限集信息,提高接口处理速度 2023-10-20 14:08:17 +08:00
yangsong
79ed1856b1 超管角色列表性能优化 2023-10-20 14:00:59 +08:00
yangsong
886a1a10a0 获取管理员列表 2023-10-20 11:37:31 +08:00
zhansihu
1e03e4c0df refactor(role-query): 用户增加返回ouid 2023-10-20 10:50:01 +08:00
zhansihu
611490ec33 Merge remote-tracking branch 'origin/feature/REQ-1502' into feature/REQ-1502 2023-10-20 10:18:53 +08:00
zhansihu
5f702191dd refactor(role-query): relation查询过滤ou和workspace 2023-10-20 10:18:47 +08:00
yangsong
1a351cee20 报错修改 2023-10-20 09:51:12 +08:00
yangsong
c437ace6d7 Merge remote-tracking branch 'origin/feature/REQ-1502' into feature/REQ-1502 
# Conflicts:
#	tyr-server/src/main/java/cn/axzo/tyr/server/controller/roleuser/RoleUserController.java
 2023-10-20 09:50:05 +08:00
yangsong
7b0be4dfd2 创建机构管理员账户角色 2023-10-20 09:48:33 +08:00
陈维伟
2bc8895177 修改dev环境企业权限模板id 2023-10-19 19:53:29 +08:00
金海洋
8309192a31 feat(server): modify queryByIdentityIdType 2023-10-19 19:26:23 +08:00
陈维伟
68832ac6ad 屏蔽测试方法 2023-10-19 19:09:29 +08:00
金海洋
542443fd25 feat(server): 修改用户角色列表接口 2023-10-19 18:02:40 +08:00
张弘昊
2defb39906 Merge remote-tracking branch 'origin/feature/REQ-1502' into feature/REQ-1502 2023-10-19 17:25:18 +08:00
张弘昊
a009656d5f 通过名称获取角色 2023-10-19 17:25:12 +08:00
陈维伟
f5ea598344 Merge remote-tracking branch 'origin/feature/REQ-1502' into feature/REQ-1502 2023-10-19 16:59:00 +08:00
陈维伟
89103ca983 dev环境CMS角色清洗一轮执行完毕 2023-10-19 16:58:54 +08:00
zhansihu
707e748a64 refactor(role-query): 改变角色查询逻辑 2023-10-19 16:26:39 +08:00
zhansihu
24f30d7fd2 Merge remote-tracking branch 'origin/feature/REQ-1502' into feature/REQ-1502 2023-10-19 15:38:20 +08:00
zhansihu
70044ff732 refactor(role-query): 增加参建单位资质条件 2023-10-19 15:38:09 +08:00
yangsong
b24927820a 创建机构用户权限 2023-10-19 13:54:38 +08:00
陈维伟
2d254e93d2 Merge remote-tracking branch 'origin/feature/REQ-1502' into feature/REQ-1502 2023-10-19 11:42:56 +08:00
陈维伟
722c2488b3 补充清除历史日志逻辑 2023-10-19 11:41:35 +08:00
zhansihu
8cff1d1338 Merge remote-tracking branch 'origin/feature/REQ-1502' into feature/REQ-1502 2023-10-19 10:16:12 +08:00
zhansihu
7009b40444 feature(permission-query): 权限检查接口 2023-10-19 10:16:06 +08:00
张弘昊
f8bc855e50 Merge remote-tracking branch 'origin/feature/REQ-1502-zhh' into feature/REQ-1502 2023-10-19 10:01:13 +08:00
张弘昊
33d1b8fddd 获取权限码 2023-10-19 09:51:10 +08:00
陈维伟
4a7f72dd09 添加备注 2023-10-18 21:14:50 +08:00
陈维伟
d26d4e7064 更新查询企业通用角色逻辑 2023-10-18 20:31:42 +08:00
陈维伟
acf37b5560 CMS数据清洗job基础逻辑 2023-10-18 19:01:59 +08:00
yangsong
df12ccdd8e Merge remote-tracking branch 'origin/feature/REQ-1502' into feature/REQ-1502 
# Conflicts:
#	tyr-api/src/main/java/cn/axzo/tyr/client/feign/TyrSaasRoleUserApi.java
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/SaasRoleUserService.java
 2023-10-18 17:02:57 +08:00
yangsong
adbdf51b80 删除用户角色 2023-10-18 17:01:21 +08:00
zhansihu
eb7d2e3005 refactor(role-query): test调整 2023-10-18 16:38:29 +08:00
zhansihu
a05bd02bf3 Merge remote-tracking branch 'origin/feature/REQ-1502' into feature/REQ-1502 
# Conflicts:
#	tyr-api/src/main/java/cn/axzo/tyr/client/feign/TyrSaasRoleApi.java
#	tyr-server/src/main/java/cn/axzo/tyr/server/controller/role/SaasRoleController.java
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/RoleService.java
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleServiceImpl.java
 2023-10-18 16:27:18 +08:00
zhansihu
ea4883c6b5 Merge remote-tracking branch 'origin/feature/REQ-1502' into feature/REQ-1502 
# Conflicts:
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleServiceImpl.java
 2023-10-18 16:24:56 +08:00
张弘昊
f757421375 通过名字获取角色信息 2023-10-18 16:24:56 +08:00
zhansihu
d14cb28066 feature(role-query): 角色分页查询接口 2023-10-18 16:22:53 +08:00
wangli
10cdd20b93 add - 新增通过工作台 id 查询权限点 2023-10-18 16:20:04 +08:00
张弘昊
2d366e4500 创建超级管理员角色 2023-10-18 15:45:36 +08:00
张弘昊
a05b3b57a5 创建超级管理员角色 2023-10-18 14:49:41 +08:00
张弘昊
0d5453efdf Merge remote-tracking branch 'origin/feature/REQ-1502' into feature/REQ-1502 
# Conflicts:
#	tyr-api/src/main/java/cn/axzo/tyr/client/feign/TyrSaasRoleUserApi.java
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/SaasRoleUserService.java
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleUserService.java
 2023-10-18 14:47:56 +08:00
张弘昊
692a0a0e66 创建超级管理员角色 2023-10-18 14:47:00 +08:00
yangsong
f967f9d736 查询角色列表bugfix 2023-10-18 11:13:28 +08:00
TanJ
cd4751ebce feat: terminal 
terminal查询逻辑调整
 2023-10-18 10:56:58 +08:00
金海洋
0161d655c0 feat(server): 删除 deleteUserRolesOfWorkspace 接口 2023-10-18 09:46:47 +08:00
yangsong
b05cc3a128 接口迁移，删除管理员角色参数调整 2023-10-17 19:22:29 +08:00
yangsong
6999302f6f Merge remote-tracking branch 'origin/feature/REQ-1502' into feature/REQ-1502 
# Conflicts:
#	tyr-api/src/main/java/cn/axzo/tyr/client/feign/TyrSaasRoleUserApi.java
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/SaasRoleUserService.java
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleUserService.java
 2023-10-17 19:20:59 +08:00
yangsong
38b200e600 接口迁移，删除管理员角色参数调整 2023-10-17 19:17:18 +08:00
金海洋
cb6aa953e1 feat(server): 增加删除工作台下的所有人员与平台角色接口 
https://jira.axzo.cn/browse/REQ-1502?goToView=1

modify:
1. 增加删除工作台下的所有人员与平台角色接口
 2023-10-17 18:55:27 +08:00
yangsong
31958870c9 接口迁移，接口定义 2023-10-17 16:59:20 +08:00
zhansihu
edba38383b refactor(permission-point): 移除适用单位类型和适用节点类型 2023-10-17 16:53:26 +08:00
zhansihu
1569262201 feature(saas-auth): 定义新的权限查人接口 2023-10-17 16:48:23 +08:00
TanJ
036809191c feat: WorkspaceJoinType 
使用int入参
 2023-10-17 14:32:37 +08:00
金海洋
25d6fb13a9 feat(server): 增加移除某个人在某个工作台的所有角色(除超管) 
https://jira.axzo.cn/browse/REQ-1502?goToView=1

modify:1. 增加 /api/saas-role-user/delete-user-role 接口
 2023-10-17 13:39:17 +08:00
TanJ
92e25beae1 fix(1502): 获取产品菜单逻辑修复 2023-10-17 13:34:34 +08:00
TanJ
2a72666dfc feat: 优化通过工作台查询产品逻辑 2023-10-17 11:04:24 +08:00
TanJ
29c059242e feat: add log 2023-10-17 10:37:20 +08:00
TanJ
aae3396474 feat: 优化 2023-10-16 21:04:07 +08:00
TanJ
4a4a6019e9 feat: 优化 2023-10-16 19:49:15 +08:00
yangsong
4928a158df bugfix，通过roleid过滤 2023-10-16 18:51:12 +08:00
TanJ
d9b5412e5d feat: 权限返回参数精简 2023-10-16 18:09:58 +08:00
TanJ
8ac09649b3 feat: 查询权限逻辑调整 2023-10-16 18:00:36 +08:00
TanJ
ef33e01d85 Merge branch 'master' into feature/REQ-1502 
# Conflicts:
#	tyr-api/src/main/java/cn/axzo/tyr/client/model/permission/PermissionPointTreeQueryReq.java
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/PermissionPointServiceImpl.java
 2023-10-16 16:28:05 +08:00
TanJ
949eef53ad feat: 注入方式调整 2023-10-16 16:08:40 +08:00
陈维伟
75b01ce7db Merge branch 'master' into feature/REQ-1309 2023-10-16 16:02:44 +08:00
TanJ
2cbf811f74 feat: remove FeignConfig.java 2023-10-16 15:21:45 +08:00
TanJ
b239181f77 feat: add log 2023-10-16 15:05:34 +08:00
TanJ
ef948f079b feat(import): 去除无效依赖 2023-10-16 10:39:56 +08:00
TanJ
31817f6934 feat(config): thread pool config 
参数调整
 2023-10-16 10:21:51 +08:00
TanJ
cd70e660a8 feat(通用接口): 添加权限通用接口 
通过人查权限
 2023-10-14 18:50:32 +08:00
金海洋
9db084c5e7 Merge branch 'feature/REQ-1141' 2023-10-14 10:06:29 +08:00
TanJ
7829278295 Merge branch 'feature/REQ-1141' into feature/REQ-1502 2023-10-13 11:47:45 +08:00
zhansihu
006e8ea668 fix(saas-auth): 数据兼容处理NPE 2023-10-11 16:25:31 +08:00
yangsong
ed08224324 dataType添加枚举常量 2023-10-11 10:13:30 +08:00
yangsong
b2a10e71ca 验证代码优化 2023-10-10 18:53:26 +08:00
yangsong
14fe3d24d2 验证代码优化 2023-10-10 16:35:12 +08:00
yangsong
0c2861eb24 去掉featureCode重复验证，修改featureCode生成规则 2023-10-10 16:18:12 +08:00
yangsong
9c7d91aced 名称重复验证bugfix 2023-10-10 10:52:24 +08:00
yangsong
447d318454 节点验证 2023-10-09 19:07:06 +08:00
yangsong
d44256638a Merge remote-tracking branch 'origin/feature/REQ-1309' into feature/REQ-1309 
# Conflicts:
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasFeatureApplyDetailServiceImpl.java
 2023-10-09 18:59:05 +08:00
yangsong
ecb789884b 节点验证 2023-10-09 18:57:04 +08:00