Commit Graph

137 Commits

Author SHA1 Message Date
ranke
76e2cf0d60 workcode 仅针对 system_users 表 2026-01-27 10:08:06 +08:00
ranke
01e6384e27 修复当用户的数据权限为"仅本人数据权限"时候,提示用户不存在的问题: http://172.16.46.63:31560/index.php?m=task&f=view&taskID=715 2026-01-27 09:36:28 +08:00
chenbowen
83545f90bd Merge remote-tracking branch 'base-version/test' into dev 2026-01-22 17:22:02 +08:00
chenbowen
3953d1128c 1. 扩展新增 eqIfNotBlank 类的查询方式 2026-01-22 17:02:49 +08:00
yangchaojin
bbc1081a47 Merge remote-tracking branch 'ztcloud/test' into dev 2026-01-21 17:33:45 +08:00
chenbowen
b93cc1ec51 1. 修复错误设置公司编码以及部门编码的bug 2026-01-21 10:46:09 +08:00
qianshijiang
688847d1a9 优化 2026-01-19 16:19:22 +08:00
ranke
291d18bba7 userId改为 workcode , 修复数据权限的问题. http://172.16.46.63:31560/index.php?m=task&f=view&taskID=715 2026-01-19 09:43:01 +08:00
ranke
1c919bec41 移除多余模块 2026-01-15 16:37:49 +08:00
lenovo
ec99f49c93 Merge remote-tracking branch 'refs/remotes/ztcloud/test' into dev 2026-01-15 16:26:57 +08:00
ranke
26ab7dac24 修改私服地址,把 seata-dm 项目从 dsc挪过来 2026-01-15 10:07:17 +08:00
chenbowen
373fd0c412 Merge remote-tracking branch 'base-version/test' into dev 2026-01-14 15:28:26 +08:00
chenbowen
f70d742e9b 恢复 erp 模块数据权限 2026-01-14 15:13:54 +08:00
qianshijiang
7a15fff979 优化 2026-01-13 15:14:09 +08:00
chenbowen
479d6c6c2a Merge remote-tracking branch 'base-version/test' into dev
# Conflicts:
#	zt-framework/zt-common/src/main/java/com/zt/plat/framework/common/util/security/CryptoSignatureUtils.java
#	zt-module-system/zt-module-system-api/src/main/java/com/zt/plat/module/system/api/sms/dto/send/SmsSendSingleToUserReqDTO.java
#	zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/api/databus/DatabusDeptProviderApiImpl.java
#	zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/controller/admin/sms/SmsCallbackController.java
#	zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/framework/sms/core/enums/SmsChannelEnum.java
2026-01-13 11:00:28 +08:00
FCL
9233f5f783 feat:登陆用户的部门数据权限接口增加角色参数;获取当前用户可访问的顶级部门列表不校验数据权限 2026-01-13 10:46:22 +08:00
FCL
cd94420b21 feat:登陆用户的部门数据权限接口增加角色参数 2026-01-13 09:56:14 +08:00
maimaishu
22b449f7d5 Merge branch 'test' of http://172.16.46.63:30001/gitlab/base-version/ztcloud into test 2026-01-12 11:06:07 +08:00
maimaishu
2489a7f73e [+]增加国密SM4加解密工具包 2026-01-12 11:05:28 +08:00
chenbowen
82c819c59a Merge remote-tracking branch 'base-version/test' into dev 2026-01-09 15:32:39 +08:00
chenbowen
5b660f5a11 1.不再过滤 get 开头的 url 2026-01-09 11:46:59 +08:00
chenbowen
4518b893a9 Merge remote-tracking branch 'base-version/main' into dev 2026-01-07 15:50:33 +08:00
chenbowen
64de518d4c 1.新增签名日志 2026-01-07 15:49:10 +08:00
maimaishu
674ef07c5a Merge branch 'test' of http://172.16.46.63:30001/gitlab/base-version/ztcloud into test 2026-01-07 08:45:17 +08:00
maimaishu
a07c71f1a0 [+]增加国密SM4接口加解密 2026-01-07 08:44:35 +08:00
chenbowen
b86a9a2811 Merge remote-tracking branch 'base-version/main' into dev 2026-01-06 15:24:13 +08:00
chenbowen
09c9276deb 1. 修复 CompanyDataPermissionIgnoreAspect 空指针问题 2026-01-06 11:17:20 +08:00
chenbowen
797cd2abd9 1. 修复 deptignore 注解会导致的空指针问题
2. 延长 databus 默认的请求超时时间
3. 调整初始化脚本部分字段的长度
2026-01-06 09:18:47 +08:00
maimaishu
88b280a33f [+]增加IWork根据ID同步接口 2026-01-05 11:33:11 +08:00
chenbowen
6ac7511019 新增忽略公司以及部门数据权限的注解 2025-12-30 18:38:07 +08:00
hewencai
8e8acd6aaf fix:修复seata2.4版本下达梦数据库回滚异常问题,增加调试日志 2025-12-29 09:54:36 +08:00
hewencai
bca34ea437 Merge remote-tracking branch 'origin/dev' into dev 2025-12-29 09:53:18 +08:00
hewencai
8b469710ce fix:修复seata2.4版本下达梦数据库回滚异常问题,增加调试日志 2025-12-29 09:53:00 +08:00
chenbowen
91b54cc9d1 1. 新增 seata 兼容模块打包 2025-12-25 18:19:46 +08:00
hewencai
1d4380adc1 Merge remote-tracking branch 'origin/dev' into dev 2025-12-25 17:44:54 +08:00
hewencai
666008e3c6 fix:修复seata2.4版本下达梦数据库回滚异常问题 2025-12-25 17:44:34 +08:00
chenbowen
1c2e8e1332 Merge remote-tracking branch 'base-version/main' into dev 2025-12-25 17:31:32 +08:00
chenbowen
e6fc24d3b1 1. 目前涉及到太多没有租户的场景,默认使用主租户兜底 2025-12-25 17:29: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
01847264d5 update:调整数据同步用户-部门,用户-岗位同步逻辑 2025-12-24 11:04:48 +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
hewencai
2dc0de96a3 update:调整数据同步用户-部门,用户-岗位同步逻辑 2025-12-24 10:41:51 +08:00
hewencai
9485d94574 update:调整数据同步用户-部门,用户-岗位同步逻辑 2025-12-24 10:36:00 +08:00
chenbowen
fe1cae483b Merge remote-tracking branch 'base-version/main' into dev 2025-12-23 13:01:48 +08:00
chenbowen
ca87ed3c52 1. 暂时简化掉所有的物流模块以及 erp 模块数据权限 2025-12-23 11:59:32 +08:00
chenbowen
0ef6ac374b Merge remote-tracking branch 'base-version/main' into dev 2025-12-23 11:46:18 +08:00
chenbowen
79452c02f6 1. 优化数据权限问题 2025-12-23 11:44:37 +08:00
chenbowen
815c595944 Merge remote-tracking branch 'base-version/main' into dev 2025-12-23 10:18:39 +08:00