zhangyue
|
63d883956b
|
修改导入用户bug
|
2026-08-25 17:26:52 +08:00 |
|
zhangyue
|
fe60fdf166
|
修改重置密码提示bug
|
2026-08-20 15:16:08 +08:00 |
|
zhangyue
|
2ef177621e
|
修改账户管理列表查询bug
修改部门管理bug
|
2026-08-19 10:46:08 +08:00 |
 zhaokai
|
2bbad4d84a
|
Merge branch 'dev_change_0814' into dev
|
2026-08-17 14:46:28 +08:00 |
|
zhaokai
|
47ebd5c6d7
|
feat(department): 优化部门树查询接口并添加资质页面租户配置
|
2026-08-17 14:46:09 +08:00 |
|
zhangyue
|
3c729cc406
|
修改corpTypeEnum
|
2026-08-17 14:23:48 +08:00 |
|
zhaokai
|
b468eaf7df
|
Merge branch 'dev_change_0814' into dev
# Conflicts:
# web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserE.java
|
2026-08-17 14:07:20 +08:00 |
|
zhaokai
|
16c316dc36
|
feat(department): 添加根据企业类型和企业ID集合查询部门树功能
|
2026-08-17 14:05:47 +08:00 |
|
zhaokai
|
961bf60ad6
|
feat(user): 完善大华系统同步功能
- 新增用户时增加头像URL空值检查，避免无效同步
- 更新用户时支持从数据库获取头像URL进行同步
- 同步大华人脸时补充完整的个人信息字段
- 增加身份证号解析计算年龄和性别功能
- 添加民族编码转换异常处理机制
- 优化同步流程的日志记录和错误处理
|
2026-08-17 10:49:40 +08:00 |
|
zhangyue
|
f8c72d18a0
|
适配系统管理配置
|
2026-08-13 16:32:47 +08:00 |
|
zhangyue
|
a1ca426edd
|
适配系统管理配置
|
2026-08-13 14:25:39 +08:00 |
|
zhangyue
|
b50e4e1082
|
Merge remote-tracking branch 'origin/dahua_koumen' into dev
|
2026-08-13 10:11:37 +08:00 |
 zhangxiongfeng
|
208ddf73ac
|
2026/8/13
|
2026-08-13 09:37:45 +08:00 |
|
zhangyue
|
a624f68f50
|
适配系统管理配置
|
2026-08-12 16:55:06 +08:00 |
|
zhangyue
|
49d840ea7d
|
Merge branch 'dev_sys_config' into dev
# Conflicts:
# web-app/src/main/java/com/zcloud/basic/info/command/UserAddExe.java
# web-app/src/main/java/com/zcloud/basic/info/command/UserImportExe.java
# web-app/src/main/java/com/zcloud/basic/info/command/UserUpdateExe.java
# web-domain/src/main/java/com/zcloud/basic/info/domain/model/CorpInfoE.java
# web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserE.java
|
2026-08-12 15:59:03 +08:00 |
|
zhangyue
|
dd02f40658
|
临时提交一级租户主账号功能
|
2026-08-12 15:35:06 +08:00 |
|
zhaokai
|
e682dc86e6
|
feat(user): 更新用户管理功能以支持大华系统集成
条件
- 实现大华人脸图片的下载和Base64转换功能
- 添加文件服务URL配置注入和使用
- 优化大华系统数据同步的日志记录和错误处理
|
2026-08-12 15:20:24 +08:00 |
|
zhaokai
|
68b225d42a
|
Merge branch 'dahua_koumen' into main_koumen
# Conflicts:
# web-app/src/main/java/com/zcloud/basic/info/command/UserAddExe.java
|
2026-08-11 19:20:04 +08:00 |
|
zhangxiongfeng
|
af5c37decf
|
人员变动查询大华接口
|
2026-08-11 18:52:59 +08:00 |
|
zhaokai
|
a0db881b2c
|
refactor(user): 优化用户增删操作的大华同步机制
sdk生产环境配置引用
|
2026-08-07 21:28:17 +08:00 |
|
zhangxiongfeng
|
4d1c5ef0ad
|
人员变动取消和大华强制同步
|
2026-08-06 10:28:49 +08:00 |
|
zhangyue
|
2a7772352c
|
适配系统管理配置
|
2026-08-05 15:52:35 +08:00 |
|
zhangxiongfeng
|
a75871b388
|
大华口门对接1.1
(cherry picked from commit 65ad2b538e)
|
2026-08-05 09:10:11 +08:00 |
|
zhangxiongfeng
|
285764928c
|
大华口门对接1.0
(cherry picked from commit 65ad2b538e)
|
2026-08-04 16:32:38 +08:00 |
|
zhangxiongfeng
|
3ef3dca48b
|
大华口门对接
(cherry picked from commit 65ad2b538e)
|
2026-08-04 14:53:06 +08:00 |
|
zhangxiongfeng
|
ae529ebcac
|
大华口门对接
(cherry picked from commit 65ad2b538e)
# Conflicts:
# web-app/src/main/java/com/zcloud/basic/info/command/UserAddExe.java
# web-app/src/main/java/com/zcloud/basic/info/command/UserRemoveExe.java
# web-app/src/main/java/com/zcloud/basic/info/command/UserUpdateExe.java
|
2026-08-04 14:52:34 +08:00 |
|
zhangxiongfeng
|
b7ba5e46c2
|
大华口门对接
(cherry picked from commit 65ad2b538e)
|
2026-08-04 14:51:08 +08:00 |
 lishiwei
|
38ce347a06
|
feat: 优化修改密码逻辑
|
2026-08-03 14:41:52 +08:00 |
|
zhangxiongfeng
|
c83d18b8a1
|
大华口门部门id修改
|
2026-08-03 10:51:53 +08:00 |
|
zhangxiongfeng
|
604d96b3fa
|
大华口门对接
|
2026-07-29 17:15:00 +08:00 |
|
zhangxiongfeng
|
ac94e9fe88
|
大华口门对接
|
2026-07-28 18:25:57 +08:00 |
|
zhangxiongfeng
|
bcb9d32b95
|
大华口门对接
|
2026-07-28 16:58:06 +08:00 |
|
zhangxiongfeng
|
9bb96f109d
|
Merge branch 'dev' of http://47.92.113.182:3000/zcloud_gbs/zcloud_gbs_basic_info_gwj into komen
|
2026-07-28 15:29:24 +08:00 |
|
zhangxiongfeng
|
8beed9d73d
|
大华口门对接
|
2026-07-28 15:29:07 +08:00 |
|
lishiwei
|
3b940c0619
|
feat: 优化修改密码逻辑
|
2026-07-28 14:29:20 +08:00 |
|
zhangxiongfeng
|
65ad2b538e
|
大华口门对接
|
2026-07-28 10:33:46 +08:00 |
|
zhangxiongfeng
|
2cc429996f
|
Merge remote-tracking branch 'origin/dev' into komen
|
2026-07-28 08:43:16 +08:00 |
|
zhaokai
|
a6c3aab30c
|
Merge branch 'dev_visual_page' into dev
|
2026-07-27 15:13:27 +08:00 |
|
zhaokai
|
c4da5decd4
|
feat(corp): 添加港区信息字段并优化用户统计查询
|
2026-07-24 15:07:57 +08:00 |
|
zhaokai
|
2467f7327e
|
fix(user): 修复九公司标识设置逻辑
- 移除九公司配置ID验证逻辑
- 直接将九公司标识设置为true
|
2026-07-21 13:33:59 +08:00 |
|
zhaokai
|
8f7f5201ea
|
feat(corp): 为可视化大屏企业用户汇总接口添加查询参数支持
|
2026-07-20 14:10:13 +08:00 |
|
zhaokai
|
1eb129d61d
|
feat(config): 修改九公司配置支持多公司ID
|
2026-07-20 12:18:01 +08:00 |
|
zhaokai
|
81d080562c
|
Merge branch 'dev_visual_page' into dev
|
2026-07-17 15:28:42 +08:00 |
|
zhaokai
|
2aa7777dfc
|
feat(corp): 添加可视化大屏-企业用户汇总统计功能
|
2026-07-17 15:28:02 +08:00 |
|
zhaokai
|
176011e6f4
|
Merge branch 'dev_visual_page' into dev
# Conflicts:
# web-adapter/src/main/java/com/zcloud/basic/info/facade/ZcloudUserFacadeImpl.java
# web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/CorpInfoMapper.java
# web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/CorpInfoRepository.java
# web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/CorpInfoRepositoryImpl.java
|
2026-07-17 14:52:37 +08:00 |
|
zhaokai
|
fdd5bc8605
|
feat(corp): 添加可视化大屏-企业部门用户统计数据接口
|
2026-07-17 14:49:55 +08:00 |
|
zhaokai
|
5dd3e1b7da
|
feat(user): 更新用户信息时同步用户状态标识
- 优化部门名称更新逻辑确保信息一致性
- 添加员工状态变更标志更新方法
- 重构用户更新命令参数处理逻辑
|
2026-07-14 16:00:32 +08:00 |
|
zhaokai
|
cf36acaea9
|
feat(user): 添加九公司用户标识功能
(cherry picked from commit ba4945e651)
|
2026-07-14 09:54:20 +08:00 |
|
zhaokai
|
ba4945e651
|
feat(user): 添加九公司用户标识功能
|
2026-07-13 13:54:29 +08:00 |
|
zhaokai
|
c631087511
|
chore(build): 人资对接调整，未测试
|
2026-07-13 10:43:15 +08:00 |