Commit Graph

259 Commits

Author SHA1 Message Date
陈维伟
2542153b2c fix bug:添加新成员角色赋予报错 2023-09-21 16:05:48 +08:00
陈维伟
3310fdfd6f 查询角色通用接口,调整角色类型为数组,支持多类型查询 2023-09-20 15:25:09 +08:00
zhansihu
3325b75321 Merge remote-tracking branch 'origin/feature/REQ-1102' into feature/REQ-1102 2023-09-19 18:53:04 +08:00
zhansihu
5909b04e27 feature(权限点): 增加BizEx异常处理 2023-09-19 18:52:57 +08:00
陈维伟
02ebffb1ef Merge remote-tracking branch 'origin/feature/REQ-1102' into feature/REQ-1102 2023-09-19 15:58:03 +08:00
陈维伟
32b324a0a0 修改角色重名文案提示 2023-09-19 15:57:55 +08:00
yangsong
79c33ce2f2 代码优化,增加对角色通用权限集存在验证 2023-09-19 14:19:43 +08:00
zhansihu
abf3bd7c0a refactor(权限点): 增加层级校验逻辑;增加删除产品关联 2023-09-19 10:55:58 +08:00
zhansihu
aa870bd7e8 Merge remote-tracking branch 'origin/feature/REQ-1102' into feature/REQ-1102 2023-09-18 18:16:53 +08:00
zhansihu
dc09ced2a9 feature(权限点): 树形查询支持类型查询,参数扩展 2023-09-18 18:16:46 +08:00
TanJ
55c67f3fcb fix: 版本统一 2023-09-18 16:49:45 +08:00
13d561bea2 add - 查询产品列表增加 ID 集合查询 2023-09-18 16:30:48 +08:00
zhansihu
109d244510 Merge remote-tracking branch 'origin/feature/REQ-1102' into feature/REQ-1102 2023-09-18 16:06:06 +08:00
zhansihu
76382d63d3 feature(权限点): 树形查询支持层级参数;字段扩展 2023-09-18 16:05:23 +08:00
5d3fb61b45 update - 产品表增加一列字典 code 值 2023-09-18 16:01:25 +08:00
yangsong
0eeb386924 获取分组权限点 bugfix 2023-09-18 15:34:38 +08:00
陈维伟
a1d60a09a6 xxl-job环境联通测试完毕,回复角色清洗job逻辑 2023-09-18 15:08:20 +08:00
陈维伟
11d535da2a 添加XxlJobConfig 2023-09-18 14:48:22 +08:00
陈维伟
5a272c98fc 角色清洗job暂时关闭逻辑,验证dev环境连通性 2023-09-18 14:25:38 +08:00
zhansihu
4a6ff5e037 Merge remote-tracking branch 'origin/feature/REQ-1102' into feature/REQ-1102 2023-09-18 13:43:40 +08:00
zhansihu
b24dcbaf0a refactor(权限点): 查询接口增加层级参数 2023-09-18 13:43:34 +08:00
yangsong
1f407110c6 允许例外设置为空 2023-09-18 11:56:18 +08:00
zhansihu
c3750cf92c debug(权限点): 增加树形接口耗时统计 2023-09-18 11:14:48 +08:00
yangsong
fa52425b59 Merge remote-tracking branch 'origin/feature/REQ-1102' into feature/REQ-1102 2023-09-18 10:21:39 +08:00
yangsong
ecc03c376d 允许将权限点设置为空 2023-09-18 10:21:29 +08:00
17b2bc9d75 update - 添加产品重名相关的校验 2023-09-18 10:19:18 +08:00
7e2cb2d11d update - 添加产品重名相关的校验 2023-09-18 10:13:36 +08:00
陈维伟
572bdcfc49 实现接口:isSuperAdmin 2023-09-16 18:41:40 +08:00
陈维伟
9907742993 fix bug 2023-09-16 18:23:45 +08:00
陈维伟
0b44d32c26 add implements 2023-09-16 18:19:59 +08:00
yangsong
3593a17951 异常处理优化 2023-09-16 18:17:12 +08:00
yangsong
8087854336 异常处理 2023-09-16 17:49:54 +08:00
陈维伟
712cfa0b86 fix bug:npe 2023-09-16 16:13:38 +08:00
yangsong
189e1ffa98 修改异常类型,合并list和page方法 2023-09-16 14:56:20 +08:00
陈维伟
5348476aa7 权限组返回结果添加创建时间和更新时间 2023-09-16 11:01:58 +08:00
yangsong
7a80452c82 Merge remote-tracking branch 'origin/feature/REQ-1102' into feature/REQ-1102 2023-09-15 18:11:17 +08:00
yangsong
8ed88b9813 角色,分组,权限集 名称不能重复验证 2023-09-15 18:11:07 +08:00
陈维伟
08c0d58345 fix bug:删除角色分组 2023-09-15 17:55:38 +08:00
陈维伟
f699a6049f fix bug:selectedOu.size 2023-09-15 17:28:23 +08:00
金海洋
1b72a1c10c feat(server): add /api/saas-role-user/delete api 2023-09-15 16:13:10 +08:00
zhansihu
1644217e75 Merge remote-tracking branch 'origin/feature/REQ-1102' into feature/REQ-1102 2023-09-15 15:08:51 +08:00
zhansihu
0aee92334e fix(权限点): 修正树形顶级展示逻辑 2023-09-15 15:08:45 +08:00
TanJ
17c741869a fix: 添加自然人ID 2023-09-15 14:56:37 +08:00
zhansihu
f3e1ac397e Merge remote-tracking branch 'origin/feature/REQ-1102' into feature/REQ-1102 2023-09-15 14:23:52 +08:00
zhansihu
42ae74b0e2 refactor(权限点): 列表查询增加IDS条件;
fix(权限点): 修正排序bug
2023-09-15 14:23:46 +08:00
yangsong
5b0eeb584b codereview bugfix 2023-09-15 14:02:24 +08:00
陈维伟
d7eafc1697 角色数据清洗 saasRoleGroup.sort=1 2023-09-15 10:14:12 +08:00
陈维伟
4eedc3ca04 Merge remote-tracking branch 'origin/feature/REQ-1102' into feature/REQ-1102 2023-09-15 10:10:04 +08:00
陈维伟
036960475a 角色数据清洗 saasRoleGroup.workspaceType=6 2023-09-15 10:09:59 +08:00
yangsong
7aa37d7d07 bugfix 2023-09-14 20:49:28 +08:00
陈维伟
599ced9fd2 code review add comment refect 2023-09-14 18:21:16 +08:00
陈维伟
c0334565aa code review add comment refect 2023-09-14 18:13:45 +08:00
陈维伟
e0501daf68 code review add comment refect 2023-09-14 17:57:44 +08:00
金海洋
b219f788aa modify OrganizationalJobConfig update api 2023-09-14 16:52:36 +08:00
金海洋
e6ceb71324 feat(server): add /api/saas-role-user/list api 2023-09-14 16:48:19 +08:00
陈维伟
675e1bd065 code review add comment 2023-09-14 16:19:53 +08:00
zhansihu
9af061131f fix(权限点): 兼容空sort 2023-09-14 16:04:42 +08:00
zhansihu
4710057f44 fix(权限点): 过滤修复 2023-09-14 14:34:30 +08:00
zhansihu
8adbb01be0 Merge remote-tracking branch 'origin/feature/REQ-1102' into feature/REQ-1102 2023-09-14 14:26:41 +08:00
zhansihu
017588b230 refactor(权限点): 代码优化 2023-09-14 14:26:35 +08:00
yangsong
3210aa2d6d package rename 2023-09-14 13:42:33 +08:00
zhansihu
0fc1694edf Merge remote-tracking branch 'origin/feature/REQ-1102' into feature/REQ-1102 2023-09-14 11:36:59 +08:00
zhansihu
f7ae347b08 refactor(权限点): 排序实现重构;支持新增时重新排序 2023-09-14 11:36:53 +08:00
yangsong
fbd3ac440a 查询角色分组树 bugfix 2023-09-14 11:02:33 +08:00
陈维伟
5aa7d1845d Merge remote-tracking branch 'origin/feature/REQ-1102' into feature/REQ-1102 2023-09-14 10:58:24 +08:00
陈维伟
627a5852c1 查询角色分组接口补充查询参数 2023-09-14 10:58:19 +08:00
TanJ
bd27016a3d feat: roleType移至common供yoke消费 2023-09-14 10:52:57 +08:00
yangsong
80140309ad 删除角色分组 2023-09-14 09:41:31 +08:00
zhansihu
3677cad80e Merge remote-tracking branch 'origin/feature/REQ-1102' into feature/REQ-1102 2023-09-13 21:06:42 +08:00
zhansihu
37d6de4412 fix(权限点): 修复delegatedType赋值 2023-09-13 21:06:37 +08:00
yangsong
22d6900246 删除例外权限集 2023-09-13 21:04:01 +08:00
yangsong
609aaddc28 例外新增保存 2023-09-13 20:24:24 +08:00
zhansihu
f7fdf994a7 Merge remote-tracking branch 'origin/feature/REQ-1204' into feature/REQ-1102 2023-09-13 19:50:24 +08:00
zhansihu
2919d720ac refactor(权限点): 兼容处理适用单位和节点 2023-09-13 19:49:45 +08:00
陈维伟
b42e6fb0ba 修复权限与权限集对应关系错误问题 2023-09-13 18:12:28 +08:00
TanJ
e756f65631 Merge remote-tracking branch 'origin/feature/REQ-1102' into feature/REQ-1102 2023-09-13 18:01:11 +08:00
TanJ
472f65adfc fix: 指删除role user 报错修复
同时添加了启动参数
2023-09-13 18:00:47 +08:00
陈维伟
87fb605eef 查询角色通用接口补充是否包含权限集的开关 2023-09-13 17:53:06 +08:00
yangsong
3c8c6179c7 通用权限点保存 2023-09-13 17:33:56 +08:00
zhansihu
5f2aeb12e2 Merge remote-tracking branch 'origin/feature/REQ-1204' into feature/REQ-1102 2023-09-13 17:06:06 +08:00
zhansihu
adc9e97a39 refactor(权限点): 参数处理调整 2023-09-13 17:05:32 +08:00
TanJ
3742128010 Merge remote-tracking branch 'origin/feature/REQ-1102' into feature/REQ-1102 2023-09-13 17:02:20 +08:00
TanJ
d3e69ba8ed feat: 添加非管理员角色进行角色变更的接口 2023-09-13 17:02:11 +08:00
yangsong
e666e5c2bc 角色新增或保存 2023-09-13 16:53:28 +08:00
陈维伟
5a49466f0d 补充权限集作用范围筛选逻辑 2023-09-13 16:45:28 +08:00
陈维伟
2ff21391e8 rename TyrSaasRoleApi 2023-09-13 15:37:13 +08:00
chenwenjian
c7e54252d1 获取workSpaceType 2023-09-13 14:53:43 +08:00
chenwenjian
750dc72a7c Merge remote-tracking branch 'origin/feature/REQ-1102' into feature/REQ-1102
# Conflicts:
#	tyr-server/src/main/java/cn/axzo/tyr/server/repository/SaasBasicDictDao.java
2023-09-13 14:51:40 +08:00
chenwenjian
2ac5dd5d77 字典更新修复 2023-09-13 14:49:14 +08:00
chenwenjian
4aa4b96914 字典更新修复 2023-09-13 14:01:31 +08:00
zhansihu
dfb5520408 fix(权限点): 兼容parent id数据 2023-09-13 13:53:24 +08:00
陈维伟
614b3289ea Merge remote-tracking branch 'origin/feature/REQ-1102' into feature/REQ-1102 2023-09-13 11:43:21 +08:00
陈维伟
cc88853f9c 补充自定义角色查询条件 2023-09-13 11:43:17 +08:00
zhansihu
eca1a4e8d5 Merge remote-tracking branch 'origin/feature/REQ-1102' into feature/REQ-1102 2023-09-13 11:42:09 +08:00
zhansihu
1742289754 fix(权限点): 兼容直接查询workspacetype 2023-09-13 11:42:03 +08:00
陈维伟
4612287b38 补充自定义角色查询条件 2023-09-13 11:05:17 +08:00
zhansihu
af0ef14370 refactor(权限点): 列表查询增加参数;删除返回bizNo 2023-09-13 10:13:57 +08:00
chenwenjian
ab57db18a2 Merge remote-tracking branch 'origin/feature/REQ-1102' into feature/REQ-1102 2023-09-13 09:54:37 +08:00
zhansihu
fd1aeee956 Merge remote-tracking branch 'origin/feature/REQ-1102' into feature/REQ-1102 2023-09-13 09:54:13 +08:00
zhansihu
b100ec729b feature(权限点): 增加列表查询接口;增加位置移动接口 2023-09-13 09:54:06 +08:00