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

1192 Commits

Author SHA1 Message Date
jinhaiyang
1727bb1188 refactor(server): 增加优雅重启 2024-06-04 16:48:24 +08:00
李昆鹏
50d569df41 feat(REQ-2300): 数据权限查询不抛异常 2024-06-04 15:05:28 +08:00
lilong
36ef8d048e feat:(REQ-2524) 有saas_role_user_relation有记录，但是对应的saas_role不存在的情况 2024-06-04 14:59:16 +08:00
lilong
f0ea5340e4 feat:(REQ-2524) 修改鉴权菜单的返回，角色没有权限，抛NPE的问题 2024-06-04 14:00:01 +08:00
李昆鹏
c3f7639dfb feat(REQ-2300): 查询数据权限接口 2024-06-03 16:38:35 +08:00
lilong
d61723aadd feat:(REQ-2509) 修改角色用户关系支持pair配对查询 2024-05-31 17:20:33 +08:00
lilong
99b822cc2f feat:(REQ-2509) 优化鉴权接口，把鉴权和查询菜单分开 2024-05-31 10:51:35 +08:00
wangli
41137a0a3e Merge remote-tracking branch 'refs/remotes/origin/master' into REQ-2393 2024-05-29 19:30:03 +08:00
李昆鹏
b5773c26b9 feat(REQ-2298): 修复bug-13017 2024-05-29 15:38:02 +08:00
lilong
76323e65f1 Merge branch 'feature/REQ-2186-2298' into feature/REQ-2524 
# Conflicts:
#	tyr-api/src/main/java/cn/axzo/tyr/client/model/roleuser/req/RoleUserReq.java
 2024-05-29 10:35:10 +08:00
lilong
913bec8ffe feat:(REQ-2298) 修改移动位置后，角色分组的租户id和单位id被改成-1的情况 2024-05-29 09:58:33 +08:00
lilong
1493848a06 feat:(REQ-2298) 修改预设角色的添加和移位按照租户id和单位id隔离 2024-05-29 09:42:51 +08:00
lilong
bf27b94651 feat:(REQ-2298) 修改自定义角色分组不支持移位置 2024-05-28 18:47:46 +08:00
lilong
abc5e7e0fa feat:(REQ-2298) 修改代码检测的阻塞问题 2024-05-27 09:47:50 +08:00
lilong
eb35009d1e feat:(REQ-2186-2298) 菜单同步依赖新增的唯一编码 2024-05-24 17:50:37 +08:00
lilong
fa2b652d08 Merge branch 'feature/REQ-2298' into feature/REQ-2186-2298 
# Conflicts:
#	tyr-api/src/main/java/cn/axzo/tyr/client/common/enums/FeatureResourceType.java
#	tyr-api/src/main/java/cn/axzo/tyr/client/model/enums/DictWorkSpaceTypeEnum.java
#	tyr-api/src/main/java/cn/axzo/tyr/client/model/req/ListRoleReq.java
#	tyr-api/src/main/java/cn/axzo/tyr/client/model/req/PageRoleReq.java
#	tyr-server/pom.xml
#	tyr-server/src/main/java/cn/axzo/tyr/server/repository/mapper/SaasFeatureResourceMapper.java
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/FeatureResourceSyncServiceImpl.java
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasFeatureResourceServiceImpl.java
 2024-05-24 17:42:55 +08:00
lilong
e7f8805cdf feat:(REQ-2298) 菜单增加唯一字段，用于菜单同步 2024-05-24 17:34:15 +08:00
李昆鹏
163457c815 feat(REQ-2298): 单测示例commit 2024-05-24 11:49:26 +08:00
李昆鹏
a144671ecb feat(REQ-2298): 单测示例commit 2024-05-24 11:29:59 +08:00
lilong
abfdbc017a feat:(REQ-2186) 增加租户的权限点list接口，政务需要查询权限点数量 2024-05-24 09:55:35 +08:00
李昆鹏
1e1d35ef7b feat(REQ-2298): 单测示例commit 2024-05-23 16:52:28 +08:00
李昆鹏
84b0298d70 feat(REQ-2298): 单测示例commit 2024-05-23 16:40:29 +08:00
lilong
9a76dc3171 feat:(REQ-2298) 增加单测配置 2024-05-23 16:36:03 +08:00
李昆鹏
30e8e914ae feat(REQ-2298): 增加查询用户权限接口 2024-05-22 17:03:34 +08:00
李昆鹏
02ba78443b feat(REQ-2298): 菜单同步修改 2024-05-22 14:32:55 +08:00
lilong
42672615a9 feat:(REQ-2298) 优化角色分组的删除、增加菜单的新字段 2024-05-22 10:10:46 +08:00
lilong
9514ac4b90 feat:(REQ-2298) 角色树增加workspaceId和ouId返回，因为oms端的自定义和预设角色是根据workspaceId和ouId的值是否为-1来定的 2024-05-21 16:27:08 +08:00
李昆鹏
22ca3c0cff feat(REQ-2298): 批量添加用户权限增加操作人 2024-05-21 14:59:29 +08:00
lilong
7a160e1ac8 feat:(REQ-2186) 替换pokonyan的page类 2024-05-21 10:32:14 +08:00
lilong
f31506e5ed feat:(hotfix-20240520) 修改人员角色时，增加特殊角色是否覆盖的逻辑，因为原来特殊角色会被覆盖掉， 2024-05-21 10:07:20 +08:00
李昆鹏
44ca72ed63 feat(REQ-2186): 产品新增，政务支持多个端 2024-05-20 15:05:15 +08:00
lilong
96ff23a4ce feat:(REQ-2186) 修改菜单同步时parentId的解析 2024-05-20 15:01:25 +08:00
李昆鹏
569b5e8fe6 feat(REQ-2186): 产品新增，政务支持多个端 2024-05-20 14:43:19 +08:00
lilong
bd7c22d33c feat:(REQ-2186) 角色分组权限编码改成租户下唯一 2024-05-20 11:38:01 +08:00
李昆鹏
6273381010 feat(REQ-2186): 产品状态调整 2024-05-17 16:47:36 +08:00
李昆鹏
04096dfe44 feat(REQ-2186): 产品状态调整 2024-05-17 16:20:04 +08:00
李昆鹏
ca5f15552d feat(REQ-2186): 新增产品增加参数校验调整 2024-05-17 11:12:47 +08:00
李昆鹏
07341fa0db feat(REQ-2186): 新增产品增加名称校验 2024-05-16 18:58:45 +08:00
李昆鹏
36945418b8 feat(REQ-2186): 新增产品增加名称校验 2024-05-16 17:34:21 +08:00
lilong
edba988a3e feat:(REQ-2186) 修改清洗菜单parentId的私有接口 2024-05-16 11:14:57 +08:00
李昆鹏
9b005e6f2d feat(REQ-2186): 查询租户产品列表增加sku返回 2024-05-15 08:36:17 +08:00
李昆鹏
e994e3ff40 feat(REQ-2186): 产品新增调整参数校验逻辑 2024-05-14 15:56:48 +08:00
李昆鹏
0b24de1ca8 feat(REQ-2186): 产品新增增加描述入参 2024-05-13 17:01:28 +08:00
李昆鹏
460cc7734c feat(REQ-2186): 产品功能管理表增加类型字段，兼容老产品 2024-05-13 14:38:45 +08:00
李昆鹏
f178ea55a5 feat(REQ-2186): 创建超管逻辑调整 2024-05-11 18:11:27 +08:00
wangli
faa2ce5cc6 Merge remote-tracking branch 'refs/remotes/origin/master' into REQ-2393 2024-05-11 16:52:14 +08:00
李昆鹏
ab0ad51a9a feat(REQ-2186): 与前端联调创建企业项目产品 2024-05-11 11:08:43 +08:00
李昆鹏
ae9b8cc310 feat(REQ-2186): 产品page接口返回数据顺序调整 2024-05-10 18:06:26 +08:00
lilong
0b0ea38794 feat:(REQ-2186) 因为存在tree中某个节点被隐藏，导致它的子节点构建在tree的root上，应该排除掉 2024-05-10 17:33:12 +08:00
lilong
62b37d46dd feat:(REQ-2186) 因为存在tree中某个节点被隐藏，导致它的子节点构建在tree的root上，应该排除掉 2024-05-10 17:23:28 +08:00
李昆鹏
0af7b3024e feat(REQ-2186): 产品page接口返回数据顺序调整 2024-05-10 17:12:23 +08:00
李昆鹏
0c28899cd1 feat(REQ-2186): 产品page接口返回数据顺序调整 2024-05-10 17:08:41 +08:00
lilong
b9d266a2a2 feat:(REQ-2186) 解决oms菜单树菜单级别节点的parentId原来是负数的情况 2024-05-10 10:47:33 +08:00
lilong
72c7de722e feat:(REQ-2186) 修改path的解析 2024-05-09 18:48:05 +08:00
lilong
eadc8d9f9f feat:(REQ-2393) 修改菜单的根节点到菜单表，修改path的生成和同步的逻辑 2024-05-08 15:15:11 +08:00
yangheng
db4f211b10 Merge branch 'master' into feature/REQ-2299 2024-05-08 14:32:08 +08:00
lilong
357647cc8e feat:(REQ-2393) 增加角色分组的page，list接口 2024-05-08 11:50:58 +08:00
李昆鹏
db0a266e5f feat(REQ-2186): 政务端菜单树、页面权限接口调整 2024-05-08 11:31:33 +08:00
wangli
0b90432bc1 remove - 移除新增的方法重载 2024-05-08 11:14:08 +08:00
lilong
e137bfee89 feat:(REQ-2186) 更换PageConverter的引入和方法 2024-05-08 09:55:41 +08:00
wangli
987e3f8854 add - 添加查询角色的重载方法,该方法目前就 yoke 有调用 2024-05-08 09:52:43 +08:00
李昆鹏
b810f9b569 feat(REQ-2186): 政务端产品接口更新 2024-05-08 08:42:07 +08:00
lilong
d1a3082851 feat:(REQ-2186) 增加根据租户查询租户的权限树，增加端的查询条件 2024-05-07 14:38:06 +08:00
李昆鹏
fd2866cc77 feat(REQ-2186): 查询租户产品信息 2024-05-07 13:54:18 +08:00
李昆鹏
992b4a8801 feat(REQ-2186): 产品管理相关接口实现 2024-05-06 18:17:05 +08:00
lilong
007e84a31c feat:(REQ-2186) 角色查询接口增加角色的用户信息返回 2024-05-06 14:27:27 +08:00
lilong
bfa2cb9f4d feat:(REQ-2186) 增加角色list接口 2024-04-30 09:36:21 +08:00
谭杰
e0168b0d50 Merge branch 'hotfix/20240426' into 'master' 
Hotfix/20240426

See merge request universal/infrastructure/backend/tyr!46
 2024-04-29 06:01:56 +00:00
lilong
bc3b392e3e feat:(REQ-2299) 解决权限被删后，权限组和权限的关系还在的NPE问题 2024-04-29 11:47:32 +08:00
lilong
f931836092 feat:(REQ-2299) 修改删除菜单数据后，导致查询权限报NPE的问题 2024-04-28 14:34:21 +08:00
TanJ
d8145ba979 fix select 2024-04-26 16:00:08 +08:00
yangheng
5ad5795197 REQ-2299 【修复】 校验&规则范围修复 2024-04-26 15:56:32 +08:00
TanJ
50690903c9 fix 还原部份代码 2024-04-26 15:24:37 +08:00
TanJ
6f5571da1d fix 接口优化 2024-04-26 14:34:43 +08:00
李昆鹏
b6d92001c1 fix(菜单移动): 菜单页面组件移动修复 2024-04-26 14:18:08 +08:00
lilong
7031bb261f feat:(REQ-2299) 修改菜单同步导致根节点的parentId和path错误的问题，原设计根节点的parentId为负数(根据端来解析)，path为当前数据的id 2024-04-26 11:02:57 +08:00
yangheng
ba27072b0f REQ-2299 【开发】 规则字段排序 2024-04-25 14:20:39 +08:00
lilong
edf6249d59 Merge remote-tracking branch 'origin/feature/REQ-2299' into feature/REQ-2299 2024-04-25 14:16:27 +08:00
lilong
387aa6d7f5 feat:(REQ-2299) 增加角色list接口 2024-04-25 14:16:12 +08:00
lilong
824901dc6c Merge branch 'master' into feature/REQ-2299 
# Conflicts:
#	tyr-server/src/main/java/cn/axzo/tyr/server/TyrApplication.java
 2024-04-25 14:08:34 +08:00
yangheng
979b597cef REQ-2299 【开发】 创建接口防重复提交 & 校验参数 2024-04-25 14:06:06 +08:00
yangheng
7570211c34 REQ-2299 【开发】 排序逻辑改造 & 删除接口 2024-04-25 10:01:34 +08:00
yangheng
43f7bcf914 REQ-2299 【开发】 默认值 2024-04-24 17:29:52 +08:00
lilong
ac9b6a31aa feat:(REQ-2227) 修改角色分组查询的bug 2024-04-23 20:04:01 +08:00
yangheng
946dec0992 REQ-2299 【开发】 基础修复 2024-04-23 20:03:00 +08:00
lilong
344d032f9b feat:(REQ-2227) 修改角色分组查询的bug 2024-04-23 19:41:26 +08:00
lilong
dee4ce0652 feat:(REQ-2227) 修改角色分组查询的bug 2024-04-23 19:36:46 +08:00
lilong
e8caebbd47 feat:(REQ-2227) 修改角色分组查询的bug 2024-04-23 19:08:24 +08:00
yangheng
415f102a23 REQ-2299 【开发】 编辑 2024-04-23 18:43:29 +08:00
yangheng
a44c4092c2 REQ-2299 【开发】 编辑 2024-04-23 18:35:00 +08:00
yangheng
75c84441cc REQ-2299 【开发】 查看详情 2024-04-23 17:09:16 +08:00
yangheng
a795125ab2 REQ-2299 【开发】 获取枚举值 2024-04-23 14:50:46 +08:00
李昆鹏
a959be8552 feat(2227-userRole): 同步完菜单清除缓存 2024-04-23 13:50:31 +08:00
yangheng
6016b586e3 REQ-2299 列表分页模糊查询 2024-04-23 10:48:54 +08:00
yangheng
17c676f4a3 REQ-2299 列表分页模糊查询 2024-04-23 10:45:44 +08:00
yangheng
69943f37ed REQ-2299 数据对象删除 2024-04-23 10:08:53 +08:00
yangheng
d8788fc476 Merge branch 'master' into feature/REQ-1902-yangheng 2024-04-23 09:54:00 +08:00
yangheng
6c5be49ec3 REQ-2299 数据对象删除 2024-04-23 09:53:30 +08:00
yangheng
d185bb2b5f REQ-2299 基础开发&创建数据对象 2024-04-23 09:38:12 +08:00
yangheng
12caa4a41e REQ-2284 基础待完成 2024-04-19 18:39:35 +08:00
李昆鹏
eadc22ead5 feat(2227-userRole): 增加角色返回字段 2024-04-19 17:04:11 +08:00
lilong
e1e7480cae feat:(REQ-2227) 解决鉴权时，terminal传空字符串的异常情况 2024-04-19 15:49:29 +08:00
lilong
4e594c02a4 feat:(REQ-2227) 修改通过category查询角色的bug 2024-04-19 14:19:30 +08:00
zhansihu
4255dabb64 fix(2227-roleGroup):修复多父级查询 2024-04-19 10:38:03 +08:00
lilong
1b2b867285 feat:(REQ-2227) 洗数据接口增加/api前缀 2024-04-18 15:21:27 +08:00
lvshaohua
370a370b11 redis测试地址 2024-04-18 11:30:04 +08:00
lvshaohua
467ff530e9 Merge branch 'feature/REQ-2227' of https://axzsource.com/universal/infrastructure/backend/tyr into feature/REQ-2227 2024-04-18 10:58:43 +08:00
lvshaohua
07c2f0d961 删除组件逻辑优化 2024-04-18 10:58:34 +08:00
lilong
0465c43acf feat:(REQ-2227) 角色查询接口增加productUnitType查询条件 2024-04-18 10:10:24 +08:00
lilong
055c69bb01 feat:(REQ-2227) 角色查询接口增加是否启用和隐藏返回 2024-04-18 09:42:30 +08:00
lilong
af5af22c3e feat:(REQ-2227) 角色查询接口增加查询条件，角色编辑时判断角色编码唯一 2024-04-17 19:46:51 +08:00
zhansihu
d649e19967 feat:(2227-navTree):补充path 2024-04-17 18:22:46 +08:00
zhansihu
89a0bee0c0 Merge remote-tracking branch 'origin/feature/REQ-2227' into feature/REQ-2227 2024-04-17 18:13:14 +08:00
zhansihu
e528e179ee feat:(2227-navTree):兼容多级菜单 2024-04-17 18:13:08 +08:00
lvshaohua
d764eadbc6 更新全部角色问题 2024-04-17 17:30:31 +08:00
李昆鹏
6976a96bd7 feat(2227-userRole): 资源树缓存key修改 2024-04-17 17:23:12 +08:00
lvshaohua
6a6fe92e5c Merge branches 'feature/REQ-2227' and 'feature/REQ-2227' of https://axzsource.com/universal/infrastructure/backend/tyr into feature/REQ-2227 2024-04-17 17:21:20 +08:00
lvshaohua
6b67cce245 删除组件接口 2024-04-17 17:21:09 +08:00
李昆鹏
a2e3d45060 feat(2227-userRole): 资源树缓存key修改 2024-04-17 17:16:54 +08:00
zhansihu
0f98b5cf44 fix:(2227-superAdmin):修复超管删除 2024-04-17 16:32:35 +08:00
zhansihu
4e48411a59 fix:(2227-superAdmin):修复超管配置 2024-04-17 15:38:58 +08:00
zhansihu
803fc736e6 Merge remote-tracking branch 'origin/feature/REQ-2227' into feature/REQ-2227 2024-04-17 15:35:34 +08:00
zhansihu
93f018565c fix:(2227-superAdmin):修复超管配置 2024-04-17 15:35:26 +08:00
lilong
3d35e4695d feat:(REQ-2227) 增加角色tree查询条件 2024-04-17 15:07:44 +08:00
lvshaohua
6979d66a26 保存时删除删除组件 2024-04-17 14:29:38 +08:00
zhansihu
00cd4331bc Merge remote-tracking branch 'origin/feature/REQ-2227' into feature/REQ-2227 2024-04-17 13:54:00 +08:00
zhansihu
4cf6494758 feat:(2227-superAdmin):调整超管创建 2024-04-17 13:53:48 +08:00
lilong
5fa71feafe feat:(REQ-2227) 修改角色创建时pids的解析逻辑 2024-04-17 13:37:29 +08:00
lilong
0a5c2653e9 feat:(REQ-2227) 修改角色创建时workspaceType的解析逻辑 2024-04-17 11:35:34 +08:00
zhansihu
693b97b733 Merge remote-tracking branch 'origin/feature/REQ-2227' into feature/REQ-2227 2024-04-17 10:49:03 +08:00
zhansihu
a280ecbc2f fix:(2227-roleGroup):修复查询条件 2024-04-17 10:48:56 +08:00
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
李昆鹏
f7d67dce23 feat(2227-通讯录): 新增自定义权限查询，保存或更新自定义权限接口，修改更新用户角色接口 2024-04-07 14:36:42 +08:00
lvshaohua
25a7888078 保存菜单接口 2024-04-07 14:09:29 +08:00
zhansihu
6cf46dba73 feat(2227-syncFeature): feature同步 2024-04-07 09:38:37 +08:00
zhansihu
b8aecba0d6 feat(2227-commonDict): 调整接口实现 2024-03-28 09:39:37 +08:00
zhansihu
9bba45c4ed feat(2227-commonDict): 接口调整 2024-03-26 17:54:44 +08:00
zhansihu
f09a13e316 feat(2227-commonDict): 通用字典查询 2024-03-26 17:53:29 +08:00
zhansihu
08c42f04da feat(userRoleJob): 支持分页参数 2024-03-19 09:56:35 +08:00
zhansihu
c2f861502e feat(userRole): 调整 2024-03-18 17:22:37 +08:00
zhansihu
193a8dae40 feat(userRole): 调整并发模式 2024-03-18 17:06:42 +08:00
zhansihu
917254304c feat(userRole): 自测调整 2024-03-18 11:22:37 +08:00
zhansihu
790d5c15a8 fix:(userRole): 实现数据清理细节 2024-03-14 16:38:37 +08:00
luofu
fcda1f3281 Merge branch 'feature/REQ-2183' of axzsource.com:universal/infrastructure/backend/tyr into feature/REQ-2183 2024-03-04 21:22:40 +08:00
luofu
8ce35d69eb fix(REQ-2183): 空指针问题处理 2024-03-04 21:22:28 +08:00
zhansihu
2cf41c76db fix:(2183-userRoleJob): job注解 2024-03-04 10:52:24 +08:00
zhansihu
5f79c8a636 fix:(2183-userRoleJob): 定义用户角色任务 2024-03-04 10:43:54 +08:00
luofu
8c19d534e9 fix(REQ-2183): 用户角色列表查询过滤已删除的角色 2024-03-03 18:05:08 +08:00
zhansihu
2aa71da9dd fix:(2183-permission): 修复免授权逻辑 2024-03-03 16:25:48 +08:00
zhansihu
386e9f8b4e fix:(2183-permission): 修复免授权逻辑 2024-03-03 16:15:53 +08:00
TanJ
8a8952e898 fix 获取权限时，判断一层产品是否已经被删除v2 2024-02-27 16:22:37 +08:00
TanJ
6bc0255346 fix 获取权限时，判断一层产品是否已经被删除 2024-02-27 16:21:54 +08:00
zhansihu
963c99ca4e Merge remote-tracking branch 'origin/feature/REQ-2046' into feature/REQ-2046 2024-02-26 21:44:32 +08:00
zhansihu
679242517a fix:(2046-permission): 暴露接口 2024-02-26 21:44:26 +08:00
TanJ
b507348d93 获取资源权限添加resourceId与resourceType字段 2024-02-22 11:42:47 +08:00
TanJ
d7ea7de0ad 删除产品时同步删除产品对应的菜单 2024-02-21 21:19:36 +08:00
zhansihu
c80af3ddc5 fix:(2046-permission): 兼容服务包无产品 2024-02-20 14:02:08 +08:00
henry
6668e52510 REQ-2046 小组长权限 2024-02-06 17:46:26 +08:00
henry
13c7b79591 REQ-2046 小组长权限 2024-02-06 17:15:54 +08:00
TanJ
a3a0eee25e 查询role user时返回 role type 2024-02-06 15:09:45 +08:00
TanJ
49fa464f52 设置代班长接口添加roleId 2024-02-06 14:36:57 +08:00
金海洋
238df67263 修改拼写错误 2024-02-03 13:51:41 +08:00
zhansihu
b5a99ddf33 fix:(2046-permission): 修复参数问题；更新权限检查接口 2024-02-02 11:13:25 +08:00
zhansihu
2386ff1179 fix:(2046-permission): 修复参数问题 2024-02-02 11:09:35 +08:00
zhansihu
06bfb0f9e3 feat(2046-permission): 修复去重逻辑 2024-02-01 16:05:11 +08:00
zhansihu
7a5ec1bfb8 feat(2046-permission): 修复角色查询 2024-02-01 15:58:21 +08:00
zhansihu
e3f2c9f17b feat(2046-permission): 修复管理角色查询 2024-02-01 15:05:00 +08:00
zhansihu
2e1e09760b feat(2046-permission): 重构权限查人逻辑 2024-02-01 14:47:57 +08:00
zhansihu
86dcb10442 Merge remote-tracking branch 'origin/master' into feature/REQ-2046 
# Conflicts:
#	tyr-api/src/main/java/cn/axzo/tyr/client/feign/TyrSaasAuthApi.java
#	tyr-server/src/main/java/cn/axzo/tyr/server/controller/auth/TyrSaasAuthController.java
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/RoleService.java
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/TyrSaasAuthService.java
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/PermissionPointServiceImpl.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/TyrSaasAuthServiceImpl.java
 2024-02-01 10:05:42 +08:00
zhansihu
cc703294fc Merge remote-tracking branch 'origin/feature/REQ-2046' into feature/REQ-2046 2024-01-31 19:59:32 +08:00
zhansihu
a9c9c00bf6 feat(2046-feature): 调整parent id处理逻辑 2024-01-31 19:59:25 +08:00
金海洋
36ff74574d /api/saas-role-user/list 增加personId的参数 2024-01-31 19:22:26 +08:00
zhansihu
9645a48518 feat(2046-feature): 调整parent id检查逻辑 2024-01-31 18:13:05 +08:00
zhansihu
dfbd7eb1c1 feat(2046-feature): 调整parent id 2024-01-31 17:58:51 +08:00
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
金海洋
447ad084d8 modify 2024-01-22 18:08:02 +08:00
zhansihu
716034a1ca feat(2046-permission): 兼容角色标签逻辑 2024-01-22 15:52:40 +08:00
金海洋
374dd3c534 增加userScope 2024-01-22 13:24:36 +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
金海洋
712f53527e feat(server): rEQ-1902 增加数据权限 
https://jira.axzo.cn/browse/REQ-1902?goToView=1

modify:
1. 创建数据资源规则            /api/data-resource/create
2. 更新数据资源规则            /api/data-resource/update
3. 删除数据资源               /api/data-resource/delete
4. 数据资源分页               /api/data-resource/page
5. 数据资源列表               /api/data-resource/list
6. 创建功能点和数据资源的关联   /api/data-resource/saas-feature
7. 删除功能点和数据资源的关联   /api/data-resource/saas-feature/delete
8. 获取某个功能点的数据资源信息 /api/data-resource/saas-feature/detail
 2024-01-16 15:28:02 +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