Commit Graph

708 Commits

Author SHA1 Message Date
lvshaohua
c649fd741b 组件类型 2024-04-17 10:42:05 +08:00
lvshaohua
bf9874ebc7 删去多余接口 2024-04-17 10:40:47 +08:00
lvshaohua
27eed8cf4d 详情页只查询子组件,不查子页面 2024-04-17 10:30:54 +08:00
lvshaohua
eb57583761 Merge branch 'feature/REQ-2227' of https://axzsource.com/universal/infrastructure/backend/tyr into feature/REQ-2227 2024-04-17 10:03:38 +08:00
lvshaohua
600482a7e8 菜单名字重复校验 2024-04-17 10:03:30 +08:00
lilong
eafda003f1 feat:(REQ-2227) 修改角色tree的查询条件 2024-04-16 19:05:14 +08:00
zhansihu
ea5522afce Merge branch 'feature/REQ-2227-zhan' into feature/REQ-2227 2024-04-16 18:43:57 +08:00
zhansihu
2fef653f9f feat:(2227-roleGroup):班组角色组权限查询 2024-04-16 18:42:59 +08:00
lvshaohua
c114695861 优化提示 2024-04-16 18:24:27 +08:00
lvshaohua
fc19267ef6 提示优化 2024-04-16 18:14:57 +08:00
lilong
4922e6cd5f feat:(REQ-2227) 增加单测 2024-04-16 17:03:26 +08:00
zhansihu
c62bcac8d9 feat(2227-roleGroup):班组角色组查询兼容 2024-04-16 16:59:03 +08:00
lilong
af815aa384 feat:(REQ-2227) 增加单测,修改角色树查询接口增加查询条件 2024-04-16 16:19:25 +08:00
zhansihu
a79b7e4272 Merge remote-tracking branch 'origin/feature/REQ-2227' into feature/REQ-2227 2024-04-16 14:09:27 +08:00
zhansihu
7df39ce166 feat(2227-permissionQuery):菜单内存排序 2024-04-16 14:09:20 +08:00
lvshaohua
5eafa4afb3 Merge branch 'feature/REQ-2227' of https://axzsource.com/universal/infrastructure/backend/tyr into feature/REQ-2227 2024-04-16 13:51:08 +08:00
lvshaohua
f8aa4b70ef terminals使用数组 2024-04-16 13:50:58 +08:00
zhansihu
ebfa886d70 feat(2227-permissionQuery):菜单排序、去重;控制角色状态 2024-04-16 13:50:54 +08:00
zhansihu
e2a4600e50 feat(2227-permissionQuery):调整免授权查询 2024-04-16 11:52:18 +08:00
zhansihu
70b9bf8955 feat(2227-permissionQuery):修复导航 2024-04-16 10:59:34 +08:00
lilong
db3c2bd4c6 feat:(REQ-2227) 修改角色移位时查询角色的接口,原接口有bug 2024-04-16 10:22:49 +08:00
zhansihu
346dab8247 feat(2227-permissionQuery):修复免授权 2024-04-15 23:06:57 +08:00
zhansihu
3940b0c394 feat(2227-permissionQuery):修复权限查询 2024-04-15 22:55:14 +08:00
zhansihu
10b79d1e33 Merge remote-tracking branch 'origin/feature/REQ-2227' into feature/REQ-2227 2024-04-15 22:28:28 +08:00
zhansihu
137f8e0d1a feat(2227-permissionQuery):修复权限查询 2024-04-15 22:28:21 +08:00
lilong
fff04954fc feat:(REQ-2227) 修改角色移位 2024-04-15 22:19:26 +08:00
zhansihu
b809351a54 feat(2227-permissionQuery):修复默认字段 2024-04-15 22:13:22 +08:00
zhansihu
9f868419bb feat(2227-permissionQuery): 修复auth缓存 2024-04-15 22:03:14 +08:00
lilong
2cc61fb759 feat:(REQ-2227) 新增角色组时去掉productUnitType 2024-04-15 21:22:30 +08:00
lilong
89058c6e28 feat:(REQ-2227) 新增角色组时sort顺序按照同一服务的分组来递增 2024-04-15 21:02:41 +08:00
zhansihu
260bd8993c feat(2227-saveResource): 修复组件子级path 2024-04-15 20:49:30 +08:00
zhansihu
419956b14e feat(2227-saveResource): 修复组件path 2024-04-15 20:12:05 +08:00
lvshaohua
d3348b5f15 parentId处理 2024-04-15 17:27:44 +08:00
zhansihu
68b33b07dc feat(2227-permissionQuery): 代码合并 2024-04-15 17:19:38 +08:00
lvshaohua
5d75d6abf0 parentId设置范围限制 2024-04-15 17:03:26 +08:00
lvshaohua
78ba865d4a Merge branch 'feature/REQ-2227' of https://axzsource.com/universal/infrastructure/backend/tyr into feature/REQ-2227 2024-04-15 16:47:29 +08:00
lvshaohua
ae4a935db3 parentId 2024-04-15 16:47:21 +08:00
zhansihu
138ca5ae21 fix(2227-NavTree): 增加返回页面路由 2024-04-15 16:34:29 +08:00
lvshaohua
e9e609c768 保存菜单角色修改参数类型 2024-04-15 15:12:37 +08:00
zhansihu
10d0db0248 Merge remote-tracking branch 'origin/feature/REQ-2227' into feature/REQ-2227 2024-04-15 13:39:59 +08:00
zhansihu
2f1d43f20c fix(2227-NavTree): 增加返回菜单图标 2024-04-15 13:39:52 +08:00
lilong
b33f5d10d3 feat:(REQ-2227) 增加清洗角色、角色组顺序的接口 2024-04-15 11:18:56 +08:00
lvshaohua
6a10e43dd6 角色改获取单个页面的,保存接口返回Id 2024-04-15 10:27:58 +08:00
李昆鹏
43ee7c4bea feat(2227-userRole): 用户角色增加返回是否展示角色字段 2024-04-12 17:31:10 +08:00
lvshaohua
c54fe0e634 删除菜单时,同步删除角色相关权限 2024-04-12 17:28:14 +08:00
lilong
d1f63a5aeb feat:(REQ-2227) 调整删除角色的接口 2024-04-12 17:00:00 +08:00
zhansihu
788634e2f4 Merge remote-tracking branch 'origin/feature/REQ-2227' into feature/REQ-2227 2024-04-12 14:50:01 +08:00
zhansihu
6ebc341033 fix(2227-NavTree): 修正权限查询 2024-04-12 14:49:54 +08:00
lvshaohua
b14defbde6 Merge branch 'feature/REQ-2227' of https://axzsource.com/universal/infrastructure/backend/tyr into feature/REQ-2227 2024-04-12 14:38:12 +08:00
lvshaohua
dde3fb71b2 菜单code重复校验 2024-04-12 14:38:04 +08:00
zhansihu
05e9b179c2 Merge remote-tracking branch 'origin/feature/REQ-2227' into feature/REQ-2227 2024-04-12 14:26:07 +08:00
zhansihu
ab66152d99 fix(2227-NavTree): 调试处理,返回所有权限 2024-04-12 14:26:01 +08:00
lilong
7ded370e51 feat:(REQ-2227) 角色tree接口增加workspaceType 2024-04-12 14:14:34 +08:00
lilong
6b47280781 feat:(REQ-2227) 角色tree接口查询增加查询条件 2024-04-12 11:47:19 +08:00
zhansihu
93483471c9 fix(2227-syncResource): 增加异步处理 2024-04-12 11:09:57 +08:00
zhansihu
f28fb8229d fix(2227-syncResource): 增加异步处理 2024-04-12 11:07:38 +08:00
lilong
3c391215a5 feat:(REQ-2227) 修改角色sort解析逻辑 2024-04-12 09:43:00 +08:00
lilong
2ffee9e1c3 feat:(REQ-2227) 角色page接口增加权限查询 2024-04-11 21:22:05 +08:00
lilong
65facb5106 feat:(REQ-2227) 增加角色的page接口,调整角色的tree接口 2024-04-11 19:08:15 +08:00
lvshaohua
a24fd8ec63 删除接口修改 2024-04-11 17:30:58 +08:00
zhansihu
dc235edbff fix(2227-baseTree): 增加基准路由查询接口 2024-04-11 17:18:44 +08:00
lilong
91cf6fb11c feat:(REQ-2227) 角色树增加id,增加角色排序 2024-04-11 16:34:39 +08:00
lvshaohua
4b0f22b912 Merge branch 'feature/REQ-2227' of https://axzsource.com/universal/infrastructure/backend/tyr into feature/REQ-2227 2024-04-11 15:12:22 +08:00
lvshaohua
7fac618f83 featureCode的唯一性校验 2024-04-11 15:12:12 +08:00
李昆鹏
55bc39e0a6 feat(2227-featureResource): 调整功能资源树根节点id规则 2024-04-11 15:01:28 +08:00
lvshaohua
c43a672ac3 Merge branch 'feature/REQ-2227' of https://axzsource.com/universal/infrastructure/backend/tyr into feature/REQ-2227 2024-04-11 14:49:26 +08:00
lvshaohua
15b1b7200c 修改菜单时删除缓存 2024-04-11 14:49:14 +08:00
李昆鹏
18efc99fa4 feat(2227-featureResource): 调整功能资源树根节点id规则 2024-04-11 13:50:50 +08:00
lilong
fe0b171f07 feat:(REQ-2227) 角色增加是否显示、是否隐藏、角色编码字段 2024-04-11 11:01:32 +08:00
lilong
f11eca13bc feat:(REQ-2227) 修改新增角色的逻辑 2024-04-11 09:47:38 +08:00
lvshaohua
f9b3d9fc39 Merge branch 'feature/REQ-2227' of https://axzsource.com/universal/infrastructure/backend/tyr into feature/REQ-2227 2024-04-10 17:46:59 +08:00
lvshaohua
0f54c9399b 菜单角色关联关系 2024-04-10 17:46:50 +08:00
李昆鹏
558c137f82 feat(2227-featureResource): 调整功能资源树根节点id规则 2024-04-10 17:36:02 +08:00
李昆鹏
c96c780d94 feat(2227-featureResource): 调整功能资源树根节点id规则 2024-04-10 17:05:28 +08:00
lvshaohua
44a328edce 获取详情树 2024-04-10 14:22:38 +08:00
lvshaohua
5d0ddf85d0 菜单保存接口 2024-04-10 11:20:09 +08:00
lvshaohua
560a2aab48 Merge branch 'feature/REQ-2227' of https://axzsource.com/universal/infrastructure/backend/tyr into feature/REQ-2227
# Conflicts:
#	tyr-server/src/main/java/cn/axzo/tyr/server/controller/permission/FeatureResourceController.java
2024-04-10 09:40:44 +08:00
lvshaohua
58b47612a4 详情接口 2024-04-10 09:39:13 +08:00
李昆鹏
ccd762b13c feat(2227-featureResource): 新增功能资源树查询接口及实现 2024-04-10 09:12:01 +08:00
李昆鹏
c61a03ba2a feat(2227-featureResource): 新增功能资源树查询接口及实现 2024-04-10 09:10:05 +08:00
lilong
ed3ac9e5f8 feat:(REQ-2227) 新增角色分组时,sort取同一个workspaceTypeCode的最大值 2024-04-09 22:40:28 +08:00
lilong
bc4736d494 feat:(REQ-2227) 添加角色分组时增加sort设置 2024-04-09 22:14:59 +08:00
lilong
25b870eda6 feat:(REQ-2227) 保存角色分组时增加code 2024-04-09 21:49:19 +08:00
lilong
152ebc182f feat:(REQ-2227) 提供角色分组相关接口 2024-04-09 21:13:37 +08:00
lvshaohua
5f884c4beb Merge branch 'feature/REQ-2227' of https://axzsource.com/universal/infrastructure/backend/tyr into feature/REQ-2227 2024-04-09 17:10:23 +08:00
lvshaohua
d1cf9e161d 菜单的排序,删除等 2024-04-09 17:10:14 +08:00
zhansihu
ce93e4d1d8 fix(2227-permissionQuery): 增加页面权限查询 2024-04-09 16:57:48 +08:00
zhansihu
ebed487c99 Merge remote-tracking branch 'origin/feature/REQ-2227' into feature/REQ-2227 2024-04-09 15:28:50 +08:00
zhansihu
107b6f784b fix(2227-permissionQuery): 增加用户功能鉴权接口 2024-04-09 15:28:42 +08:00
lilong
672c7d96c7 feat:(REQ-2227) 提供角色tree接口 2024-04-09 14:07:15 +08:00
lvshaohua
906699c863 保存菜单的排序问题 2024-04-08 20:50:42 +08:00
zhansihu
0aeae35a1a fix(2227-permissionQuery): 处理分支错误 2024-04-08 19:36:14 +08:00
李昆鹏
308623e6d4 feat(2227-通讯录): modify保存或更新自定义权限接口 2024-04-08 16:26:32 +08:00
zhansihu
2436b8ab65 fix(2227-merge): 何必冲突 2024-04-08 15:27:32 +08:00
zhansihu
57eccebad7 Merge branch 'feature/REQ-2227' of axzsource.com:universal/infrastructure/backend/tyr into feature/REQ-2227
# Conflicts:
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/SaasFeatureResourceService.java
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasFeatureResourceServiceImpl.java
2024-04-08 15:24:17 +08:00
lvshaohua
e25a6b9095 菜单组件的保存 2024-04-08 15:20:56 +08:00
zhansihu
695d48560e feat(2227-permissionQuery): 查询用户角色和权限 2024-04-08 15:20:54 +08:00
zhansihu
7dcdd143d5 feat(2227-permissionQuery): 导航菜单查询接口定义 2024-04-07 17:55:47 +08:00
zhansihu
665f312ec1 Merge remote-tracking branch 'origin/feature/REQ-2227' into feature/REQ-2227
# Conflicts:
#	tyr-api/src/main/java/cn/axzo/tyr/client/feign/FeatureResourceApi.java
#	tyr-server/src/main/java/cn/axzo/tyr/server/controller/permission/FeatureResourceController.java
2024-04-07 14:41:10 +08:00
zhansihu
bffda7fbc0 feat(2227-syncFeature): feature同步实现 2024-04-07 14:40:23 +08:00