chenbowen
|
03b04cd7fe
|
Merge branch 'dev' into test
|
2026-01-09 13:57:09 +08:00 |
|
chenbowen
|
cf540e12be
|
Merge remote-tracking branch 'base-version/test' into dev
|
2026-01-09 13:56:51 +08:00 |
|
chenbowen
|
c2f38608e7
|
1.新增用户界面的用户来源类型展示
|
2026-01-08 17:05:21 +08:00 |
|
chenbowen
|
b245bed7da
|
Merge branch 'dev' into test
|
2026-01-06 15:24:46 +08:00 |
|
chenbowen
|
b86a9a2811
|
Merge remote-tracking branch 'base-version/main' into dev
|
2026-01-06 15:24:13 +08:00 |
|
maimaishu
|
88b280a33f
|
[+]增加IWork根据ID同步接口
|
2026-01-05 11:33:11 +08:00 |
|
maimaishu
|
2e761d1867
|
[+]增加部门推动消息功能
|
2026-01-02 17:27:53 +08:00 |
|
ranke
|
0ad14fbe73
|
Merge branch 'test' into test-dsc
* test:
新增根据流程实例ID获取抄送记录的接口,用于待办详情中展示
[+]增加部门推动消息功能
新增忽略公司以及部门数据权限的注解
|
2025-12-31 17:07:09 +08:00 |
|
maimaishu
|
3573217507
|
[+]增加部门推动消息功能
|
2025-12-31 16:55:20 +08:00 |
|
qianshijiang
|
b155b1a00a
|
数据库配置修改
|
2025-12-31 16:36:01 +08:00 |
|
chenbowen
|
d9ab32165f
|
Merge branch 'dev' into test
|
2025-12-25 10:47:38 +08:00 |
|
chenbowen
|
b698706dad
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-12-25 10:47:20 +08:00 |
|
chenbowen
|
09c726d51b
|
1. 避免无登录的操作无法记录日志的情况
2. 短信登录可以不传递租户信息
|
2025-12-25 10:46:45 +08:00 |
|
hewencai
|
3903b73905
|
Merge remote-tracking branch 'ztcloud/main' into main-ztcloud
# Conflicts:
# zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/service/dept/DeptService.java
|
2025-12-24 11:15:23 +08:00 |
|
hewencai
|
516198ab53
|
update：调整数据同步用户-部门，用户-岗位同步逻辑
|
2025-12-24 11:04:45 +08:00 |
|
hewencai
|
7ef5545dc0
|
update：调整数据同步用户-部门，用户-岗位同步顺序
|
2025-12-24 11:04:03 +08:00 |
|
hewencai
|
9b0e63a33e
|
update：调整数据同步用户-部门，用户-岗位同步顺序
|
2025-12-24 11:04:01 +08:00 |
|
wencai he
|
0fdfce0626
|
Merge branch 'dev' into 'test'
Dev
See merge request jygk/dsc!14
|
2025-12-24 02:37:39 +00:00 |
|
hewencai
|
a411da6754
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-12-24 10:36:17 +08:00 |
|
hewencai
|
9485d94574
|
update：调整数据同步用户-部门，用户-岗位同步逻辑
|
2025-12-24 10:36:00 +08:00 |
|
chenbowen
|
433e2fb4de
|
1. 修改每日最大发送次数
|
2025-12-24 10:27:57 +08:00 |
|
chenbowen
|
b9c44ebf91
|
Merge branch 'dev' into test
|
2025-12-24 10:15:46 +08:00 |
|
chenbowen
|
f526dd54b9
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-12-24 10:15:27 +08:00 |
|
chenbowen
|
7e87465ef9
|
1. 修正有误的短信配置
|
2025-12-24 10:14:52 +08:00 |
|
chenbowen
|
2052479728
|
1. 临时新增短信平台的单独 topic 消费
|
2025-12-23 19:05:07 +08:00 |
|
chenbowen
|
2efa78ed74
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-12-22 13:47:15 +08:00 |
|
hewencai
|
0bdded447a
|
update：调整数据同步用户-部门，用户-岗位同步顺序
|
2025-12-22 11:03:15 +08:00 |
|
hewencai
|
cea886c9b2
|
update：调整数据同步用户-部门，用户-岗位同步顺序
|
2025-12-22 09:51:05 +08:00 |
|
chenbowen
|
bdd22ed132
|
1. 去除部门编码为空时，默认使用 id 作为 code 进行映射的逻辑
|
2025-12-18 22:26:05 +08:00 |
|
chenbowen
|
494de02d65
|
1. 修复父子部门跨页场景下，无法正确生成层级代码的bug
|
2025-12-18 21:39:49 +08:00 |
|
chenbowen
|
a86b98b0f5
|
1. 新增 permissionApi 查询当前用户权限级别的方法
|
2025-12-18 20:26:27 +08:00 |
|
chenbowen
|
6dd44ea02d
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-12-18 14:21:38 +08:00 |
|
chenbowen
|
1fa7416905
|
1. 统一 iwork 的同步组织代码生成逻辑
|
2025-12-18 14:18:56 +08:00 |
|
chenbowen
|
c86a765b73
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-12-18 13:21:03 +08:00 |
|
chenbowen
|
870c6a5f88
|
1. 统一 iwork 的同步组织代码生成逻辑
|
2025-12-18 13:19:39 +08:00 |
|
chenbowen
|
878dfde572
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-12-17 15:10:28 +08:00 |
|
chenbowen
|
1303ac250e
|
1. 使用 id 进行同步，避免 username 修改后提示重复的 bug
|
2025-12-17 15:10:06 +08:00 |
|
chenbowen
|
a4924bd718
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-12-17 14:40:00 +08:00 |
|
chenbowen
|
d81413e239
|
1. 修复 databus 在多层嵌套的 json 报文，签名存在异常的 bug
|
2025-12-17 14:39:23 +08:00 |
|
hewencai
|
7e25d6d106
|
fix：修复数据同步配置校验缺失问题
(cherry picked from commit 13403ea027)
|
2025-12-16 18:43:38 +08:00 |
|
hewencai
|
13403ea027
|
fix：修复数据同步配置校验缺失问题
|
2025-12-16 18:43:08 +08:00 |
|
hewencai
|
fcc32fa2d8
|
Merge remote-tracking branch 'ztcloud/main' into main-ztcloud
|
2025-12-16 16:36:56 +08:00 |
|
hewencai
|
8782631eaa
|
update：数据同步分发机构岗位绑定关系
|
2025-12-16 16:36:30 +08:00 |
|
chenbowen
|
afc8c0f23c
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-12-16 14:02:53 +08:00 |
|
chenbowen
|
b6f5649b97
|
1. 新增生成自有组织 CODE，同步其他系统额外生成编码映射关系，添加相关的单元测试用例
|
2025-12-16 14:00:52 +08:00 |
|
hewencai
|
ba1bc1fb6f
|
update：数据同步分发机构岗位绑定关系
|
2025-12-16 12:03:15 +08:00 |
|
chenbowen
|
df3e80d907
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-12-15 21:14:45 +08:00 |
|
chenbowen
|
69d3dbc61f
|
1. 新增生成自有组织 CODE，同步其他系统额外生成编码映射关系
|
2025-12-15 21:14:06 +08:00 |
|
chenbowen
|
951b9bf67d
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-12-15 19:26:14 +08:00 |
|
chenbowen
|
2323ee5c3b
|
1. 新增生成自有组织 CODE，同步其他系统额外生成编码映射关系
|
2025-12-15 19:25:19 +08:00 |
|