疯狂的狮子Li
|
e9936334e5
|
Merge remote-tracking branch 'origin/dev' into warm-flow-future
|
2025-01-08 11:02:01 +08:00 |
|
AprilWind
|
4de9fa33b7
|
update 优化修改部门信息增加事务
|
2025-01-07 05:23:27 +08:00 |
|
gssong
|
07bc56baf7
|
add 新增添加租户同步默认流程定义
|
2025-01-05 11:30:31 +08:00 |
|
dap
|
8bd2e27653
|
update: 增加菜单选择拓展参数
|
2025-01-04 16:08:57 +08:00 |
|
疯狂的狮子Li
|
af98c10285
|
Revert "update 获取用户简略信息，祖级部门列表，部门负责人等"
This reverts commit e47319597a24dcf7ab77c4326154c057357d7b74.
|
2024-12-20 09:06:10 +00:00 |
|
AprilWind
|
e47319597a
|
update 获取用户简略信息，祖级部门列表，部门负责人等
|
2024-12-20 16:42:13 +08:00 |
|
疯狂的狮子Li
|
927565c02b
|
Merge remote-tracking branch 'origin/dev' into warm-flow-future
|
2024-12-17 16:56:25 +08:00 |
|
QianRj
|
9768023d38
|
fix: 修复数据权限导致的个人中心的修改头像和修改密码接口错误
|
2024-12-17 12:35:19 +08:00 |
|
疯狂的狮子Li
|
02be6a4e93
|
Revert "update 优化 删除无用方法"
This reverts commit 0185a468bdb790ace78a37c69dbccc61063b2945.
|
2024-12-15 00:26:07 +08:00 |
|
疯狂的狮子Li
|
8c78c6d3f2
|
Merge remote-tracking branch 'origin/dev' into warm-flow-future
|
2024-12-15 00:24:27 +08:00 |
|
QianRj
|
fcebda8987
|
fix: 修复数据权限缓存错误
|
2024-12-13 20:37:55 +08:00 |
|
疯狂的狮子Li
|
0a1d49fc32
|
update 重构 将工作流查询逻辑封装为单独的service类
|
2024-12-13 18:29:00 +08:00 |
|
AprilWind
|
c681b50ae4
|
update 回退优化 删除无用方法
|
2024-12-13 10:14:20 +08:00 |
|
疯狂的狮子Li
|
0185a468bd
|
update 优化 删除无用方法
|
2024-12-13 00:15:49 +08:00 |
|
疯狂的狮子Li
|
70ffb62b88
|
update 优化 删除无用方法
|
2024-12-13 00:15:30 +08:00 |
|
疯狂的狮子Li
|
7220116e7f
|
Merge remote-tracking branch 'origin/dev' into warm-flow-future
# Conflicts:
# ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java
|
2024-12-12 23:39:18 +08:00 |
|
疯狂的狮子Li
|
c566f2ae28
|
update 优化 调整方法位置
|
2024-12-12 23:38:16 +08:00 |
|
疯狂的狮子Li
|
86212f4818
|
Merge remote-tracking branch 'origin/dev' into warm-flow-future
# Conflicts:
# ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/DeptService.java
# ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/PostService.java
# ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/RoleService.java
# ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/UserService.java
# ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java
# ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java
|
2024-12-12 23:35:15 +08:00 |
|
疯狂的狮子Li
|
ab3e4978b1
|
update 优化 为部门角色岗位用户增加一些常用查询方法
|
2024-12-12 23:32:33 +08:00 |
|
疯狂的狮子Li
|
0027f671d2
|
update 优化 登录用户增加岗位数据
|
2024-12-12 23:31:26 +08:00 |
|
DoubleH
|
dd17246086
|
!613 refactor 优化代码
* update 优化代码
|
2024-12-12 14:15:59 +00:00 |
|
AprilWind
|
7d48bc9628
|
Merge remote-tracking branch 'origin/dev' into warm-flow-future
|
2024-12-12 09:24:02 +08:00 |
|
疯狂的狮子Li
|
d7b0dc91d5
|
update 优化 去除部门查询状态校验 改为前端过滤 便于查看禁用部门下的其他数据
|
2024-12-11 18:12:31 +08:00 |
|
疯狂的狮子Li
|
4598d4d843
|
update 优化 部门树增加禁用标志位
|
2024-12-11 15:31:17 +08:00 |
|
AprilWind
|
bce27cedc9
|
Merge branch 'dev' into warm-flow-future
|
2024-12-06 17:24:40 +08:00 |
|
疯狂的狮子Li
|
c17225abb1
|
update 优化 在线用户查询 优先查询租户下数据 减少数据量
|
2024-12-06 10:11:38 +08:00 |
|
AprilWind
|
557165b863
|
update 新增获取部门负责人
|
2024-12-02 19:47:50 +08:00 |
|
songgaoshuai
|
78e2562e2a
|
Merge branch 'dev' into warm-flow-future
|
2024-11-28 16:38:54 +08:00 |
|
疯狂的狮子Li
|
8dc4b5cf6b
|
update 优化 租户日志模块名
|
2024-11-27 15:22:05 +08:00 |
|
疯狂的狮子Li
|
847b158283
|
update 优化 个人中心强退设备接口路径
|
2024-11-22 15:59:40 +08:00 |
|
AprilWind
|
4f82f2b315
|
Merge remote-tracking branch 'origin/dev' into warm-flow-future
|
2024-11-13 10:20:02 +08:00 |
|
AprilWind
|
6a7ec27a21
|
update 当前用户所有权限岗位ID改为从token获取
|
2024-11-12 17:25:16 +08:00 |
|
AprilWind
|
9708d6e1bc
|
update 当前用户所有权限增加岗位ID权限
|
2024-11-12 16:21:09 +08:00 |
|
AprilWind
|
5b337b4d2f
|
update 更新通过岗位ID查询用户
|
2024-11-12 15:47:27 +08:00 |
|
疯狂的狮子Li
|
5c66f3b90c
|
update 优化 支持脱敏传多角色多权限标识
|
2024-11-12 10:37:51 +08:00 |
|
AprilWind
|
ca2abdc5c6
|
Merge remote-tracking branch 'origin/dev' into warm-flow-future
# Conflicts:
# ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDeptMapper.java
# ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java
# ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPostServiceImpl.java
# ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java
# ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java
|
2024-11-11 16:00:42 +08:00 |
|
疯狂的狮子Li
|
63d22b9b33
|
update 优化 角色删除清理缓存
|
2024-11-11 13:58:29 +08:00 |
|
疯狂的狮子Li
|
b4678b74ab
|
update 优化 使用ObjectUtils新增方法封装代码
|
2024-11-11 13:52:16 +08:00 |
|
疯狂的狮子Li
|
a82ed1e9dd
|
update 优化 数据权限查询增加缓存
|
2024-11-11 13:30:58 +08:00 |
|
疯狂的狮子Li
|
9cdcbbccbf
|
update 重构 将UserConstants改为SystemConstants 统一常量使用 降低使用难度避免误解
|
2024-11-11 10:26:34 +08:00 |
|
AprilWind
|
b820a98c6c
|
docs：补充Mapper层注释
|
2024-11-11 10:05:52 +08:00 |
|
AprilWind
|
a1b71d654c
|
update 查询部门并返回任务指派的列表根据部门树搜索
|
2024-11-07 16:03:48 +08:00 |
|
AprilWind
|
b04c9bee21
|
Merge remote-tracking branch 'origin/dev' into warm-flow-future
# Conflicts:
# ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPostServiceImpl.java
# ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java
# ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WorkflowServiceImpl.java
|
2024-11-07 15:54:02 +08:00 |
|
疯狂的狮子Li
|
0a0a16f969
|
update 优化 封装部门基于父id查询方法
|
2024-11-07 15:48:34 +08:00 |
|
AprilWind
|
a0282b693a
|
update 优化任务办理人分组
|
2024-11-07 15:24:07 +08:00 |
|
AprilWind
|
4f3d79faa0
|
update 优化任务办理人查询
|
2024-11-07 14:29:35 +08:00 |
|
AprilWind
|
178027931d
|
update 优化任务办理人查询
|
2024-11-07 12:56:29 +08:00 |
|
AprilWind
|
e46d26b54e
|
update 完善任务办理人
|
2024-11-07 12:20:20 +08:00 |
|
AprilWind
|
22cd701d94
|
add 新增角色办理人
|
2024-11-07 10:02:15 +08:00 |
|
疯狂的狮子Li
|
7d856b030b
|
update 优化 不传用户id不校验数据权限
|
2024-11-05 16:52:10 +08:00 |
|