 SondonYong
|
5fbc9fca9d
|
dev:用户列表身份证模糊搜索
|
2025-12-17 16:54:11 +08:00 |
 zhaokai
|
ab6976a66a
|
相关方入职离职处理
|
2025-12-15 15:37:00 +08:00 |
|
zhaokai
|
b43bbfbd21
|
添加返回值信息
|
2025-12-12 18:07:14 +08:00 |
zhangyue
|
db6e68d7d2
|
获取企业列表接口
|
2025-12-11 17:15:04 +08:00 |
|
zhaokai
|
82ceeed10d
|
登录验证码
|
2025-12-11 11:41:17 +08:00 |
|
zhangyue
|
3e38c33a63
|
修改用户查询主账号权限
|
2025-12-10 16:45:24 +08:00 |
|
zhangyue
|
568dcb67bb
|
租户删除时，同步删除gbs底座租户
|
2025-12-10 16:02:21 +08:00 |
|
zhaokai
|
d311d9bfcf
|
审核相关
|
2025-12-10 15:13:39 +08:00 |
|
SondonYong
|
59b29cdc76
|
dev:用户列表根据部门ids查询条件
|
2025-12-10 09:50:53 +08:00 |
|
SondonYong
|
dedfa79179
|
dev:sql报错修改
|
2025-12-09 10:54:17 +08:00 |
|
zhaokai
|
85b2be2b79
|
身份证获取生日等信息
|
2025-12-09 10:47:51 +08:00 |
|
zhaokai
|
53a50a96d1
|
多余代码
|
2025-12-08 15:23:06 +08:00 |
|
SondonYong
|
dc8d6d89f6
|
dev:查询人员列表新增根据部门ids批量查询
|
2025-12-08 13:48:02 +08:00 |
|
zhangyue
|
82144aed78
|
数据权限
|
2025-12-08 08:56:47 +08:00 |
|
SondonYong
|
4ceb5bbc8c
|
dev:问题反馈接口
|
2025-12-06 11:38:11 +08:00 |
|
SondonYong
|
b6a19bb02c
|
Merge remote-tracking branch 'origin/main' into main
|
2025-12-06 11:12:36 +08:00 |
|
SondonYong
|
fba97bff31
|
dev:自测模拟人资数据接口
|
2025-12-06 11:12:32 +08:00 |
|
zhangyue
|
d85aa718b2
|
用户
|
2025-12-06 10:31:44 +08:00 |
|
SondonYong
|
ccb520416f
|
dev:人资相关代码
|
2025-12-05 17:35:02 +08:00 |
|
SondonYong
|
bf55c68f13
|
Merge remote-tracking branch 'origin/main' into main
|
2025-12-05 14:18:31 +08:00 |
|
SondonYong
|
6d89fa3b26
|
dev:人资相关, 解除部分验证码校验
|
2025-12-05 14:18:28 +08:00 |
|
zhaokai
|
6febd963e6
|
离职入职相关
|
2025-12-05 14:13:34 +08:00 |
|
SondonYong
|
4eba5d151a
|
dev:app端注册和扫码入职代码修改
|
2025-12-05 13:45:20 +08:00 |
|
zhaokai
|
f48068496c
|
离职入职相关
|
2025-12-05 11:24:56 +08:00 |
|
zhaokai
|
7b841a1a5a
|
离职入职相关
|
2025-12-05 10:55:38 +08:00 |
|
zhaokai
|
40b5a4ce58
|
离职入职相关
|
2025-12-05 10:14:01 +08:00 |
|
SondonYong
|
73eb9c4db1
|
dev:app端注销账号
|
2025-12-05 09:37:08 +08:00 |
|
SondonYong
|
0860cba729
|
dev:app端扫码入职流程代码修改
|
2025-12-05 08:29:09 +08:00 |
|
SondonYong
|
9b6dc266d8
|
dev:app端扫码入职流程代码修改
|
2025-12-04 16:52:41 +08:00 |
|
SondonYong
|
683a681e10
|
Merge remote-tracking branch 'origin/main' into main
|
2025-12-04 15:08:17 +08:00 |
|
SondonYong
|
e786fecd88
|
dev:app端扫码入职流程代码修改
|
2025-12-04 15:07:10 +08:00 |
|
zhaokai
|
1da601c77b
|
离职入职相关
|
2025-12-04 15:02:21 +08:00 |
|
zhaokai
|
2d63d0715e
|
离职入职相关
|
2025-12-04 09:14:31 +08:00 |
|
zhaokai
|
f6b859b5d9
|
离职入职相关
|
2025-12-03 16:32:54 +08:00 |
|
zhaokai
|
5b6233931f
|
Merge remote-tracking branch 'origin/main'
# Conflicts:
# web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/UserCorpRepository.java
# web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserCorpRepositoryImpl.java
|
2025-12-03 16:31:47 +08:00 |
|
zhaokai
|
141f6cfed8
|
离职入职相关
|
2025-12-03 16:31:02 +08:00 |
|
SondonYong
|
67654360ea
|
Merge remote-tracking branch 'origin/main' into main
# Conflicts:
# web-adapter/src/main/java/com/zcloud/basic/info/app/AppUserController.java
# web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/UserCorpRepository.java
# web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserCorpRepositoryImpl.java
|
2025-12-03 16:19:01 +08:00 |
|
SondonYong
|
0a2315b30b
|
dev:app入职相关接口
|
2025-12-03 16:17:58 +08:00 |
|
zhaokai
|
a6c6ca6241
|
离职入职相关
|
2025-12-03 15:56:59 +08:00 |
|
SondonYong
|
ce6f71a9ac
|
dev:app相关接口
|
2025-12-03 14:00:03 +08:00 |
|
zhaokai
|
e0ed80a261
|
用户离职相关，流动人员，等
|
2025-12-03 08:19:22 +08:00 |
|
SondonYong
|
6340fc6149
|
dev:修改
|
2025-12-02 18:14:42 +08:00 |
|
SondonYong
|
f1ddba3960
|
dev:修改字段
|
2025-12-02 17:56:40 +08:00 |
|
SondonYong
|
dc9840c477
|
init: 代码初始化:1.用户变更记录,2.用户工作交接
|
2025-12-02 14:17:33 +08:00 |
|
zhaokai
|
e94563be9d
|
用户添加岗位名称
|
2025-12-02 10:46:20 +08:00 |
|
zhaokai
|
d028887a3c
|
用户添加是否流动人员标志
|
2025-12-02 10:15:35 +08:00 |
|
SondonYong
|
06d2957b4f
|
Merge remote-tracking branch 'origin/main' into main
|
2025-12-01 16:40:44 +08:00 |
|
zhaokai
|
5c683b4d4a
|
企业增加多选条件及开户人
|
2025-12-01 16:23:53 +08:00 |
|
SondonYong
|
16e852b061
|
dev:岗位管理去除是否监管岗位
|
2025-12-01 15:56:50 +08:00 |
|
zhaokai
|
4cfd50d167
|
企业添加开户人和选取形式字段
|
2025-12-01 13:32:04 +08:00 |
|
SondonYong
|
d16689e719
|
Merge remote-tracking branch 'origin/main' into main
|
2025-12-01 11:36:46 +08:00 |
|
SondonYong
|
ee8f8f6a4a
|
dev:新增移动端上传用户人脸照片接口
|
2025-12-01 11:36:37 +08:00 |
|
zhangyue
|
437880dccd
|
新增部门dubbo接口增加参数
|
2025-12-01 11:33:29 +08:00 |
|
SondonYong
|
61b3655b0a
|
dev:文案修改:入职->在职
|
2025-12-01 10:40:34 +08:00 |
|
SondonYong
|
a5aba89f61
|
dev:新增用户默认入职
|
2025-12-01 10:37:26 +08:00 |
|
SondonYong
|
2a8632f93c
|
Merge remote-tracking branch 'origin/main' into main
|
2025-12-01 09:55:23 +08:00 |
|
SondonYong
|
8deab6fdf5
|
dev:岗位列表查询修改
|
2025-12-01 09:55:19 +08:00 |
|
zhaokai
|
79f0b075dc
|
统一用户管理修复
|
2025-12-01 09:11:35 +08:00 |
|
SondonYong
|
45c6a46e96
|
dev:人员导入(部门岗位反哺版)
|
2025-11-29 11:19:37 +08:00 |
|
SondonYong
|
226ada2536
|
dev:人员导入(部门岗位反哺版)
|
2025-11-28 16:52:42 +08:00 |
|
zhaokai
|
7579b5790e
|
修改用户排序
|
2025-11-28 15:33:19 +08:00 |
|
zhaokai
|
e34ed803d7
|
人员username为空的话，默认手机号
|
2025-11-28 15:07:14 +08:00 |
|
zhaokai
|
6ad31a5c3f
|
部门校验名字是否重复
|
2025-11-28 14:50:52 +08:00 |
|
zhaokai
|
8ba09d4d1d
|
修改排序及路由
|
2025-11-28 14:39:03 +08:00 |
|
zhaokai
|
c8f344ebe2
|
根据登录人密码获取查询人手机号和身份证号
|
2025-11-28 14:21:30 +08:00 |
|
zhangyue
|
f2b527d32a
|
1.修改密码 2.禁用租户
|
2025-11-27 15:03:38 +08:00 |
|
zhaokai
|
6709e3dd2a
|
企业默认时间排序
|
2025-11-26 15:29:20 +08:00 |
|
zhaokai
|
56b2d17949
|
部门排序
|
2025-11-26 14:55:53 +08:00 |
|
zhangyue
|
efee0d58ce
|
修改企业新增
|
2025-11-25 15:53:57 +08:00 |
|
zhangyue
|
a4aa60c540
|
企业名称查重
|
2025-11-22 18:00:51 +08:00 |
|
zhangyue
|
9c84548f12
|
用户批量导入
|
2025-11-22 17:15:17 +08:00 |
|
zhangyue
|
f27fb33063
|
企业名称验证
|
2025-11-22 09:27:30 +08:00 |
|
zhangyue
|
29d03cb87f
|
用户新增 age, birthday, and sex
|
2025-11-21 17:31:08 +08:00 |
|
SondonYong
|
926a1fc891
|
fixed:新增校验统一社会信用代码是否重复接口;人员资质证书列表新增返回参数
|
2025-11-21 17:14:02 +08:00 |
|
zhangyue
|
ff5cbfb094
|
1.增加重置密码功能
2.增加用户新增验证
|
2025-11-21 15:43:51 +08:00 |
|
SondonYong
|
c00c0c9155
|
Merge remote-tracking branch 'origin/main' into main
# Conflicts:
# 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
|
2025-11-21 10:01:54 +08:00 |
|
zhaokai
|
ee652ca889
|
部门树状结构增加企业名称
|
2025-11-21 09:58:14 +08:00 |
|
SondonYong
|
8e5559c9e0
|
fixed:11976 3端都有 社会统一信用代码没有判重
|
2025-11-21 09:11:15 +08:00 |
|
SondonYong
|
5bbce9f03d
|
fixed:修复bug
|
2025-11-20 17:45:13 +08:00 |
|
zhangyue
|
38a8775824
|
用户列表查询接口
|
2025-11-20 11:17:03 +08:00 |
|
zhaokai
|
14a6ffc7d0
|
企业搜索排序
|
2025-11-20 10:01:56 +08:00 |
|
zhaokai
|
a6131058b2
|
部门增加所有企业的树状结构
|
2025-11-19 17:14:13 +08:00 |
|
zhaokai
|
f9cf3cda3a
|
部门删除增加岗位验证逻辑
|
2025-11-19 11:34:34 +08:00 |
|
zhaokai
|
94695d3187
|
修改排序
|
2025-11-19 11:21:09 +08:00 |
|
zhaokai
|
a5f29f3bac
|
增加部门负责人
|
2025-11-19 10:35:24 +08:00 |
|
zhangyue
|
7c91d615b5
|
修改新增用户默认值
|
2025-11-18 17:53:56 +08:00 |
|
zhangyue
|
4f6f629885
|
修改文件上传、新增用户、新增部门
|
2025-11-18 14:31:59 +08:00 |
|
zhangyue
|
ae0f84b10d
|
gbs底座数据互通
|
2025-11-18 09:04:37 +08:00 |
|
SondonYong
|
e6114208fd
|
dev:依赖修改
|
2025-11-12 14:16:37 +08:00 |
|
SondonYong
|
3cb753d138
|
Merge remote-tracking branch 'origin/main' into main
# Conflicts:
# web-client/src/main/java/com/zcloud/basic/info/dto/UserQualificationInfoPageQry.java
# web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/DepartmentRepository.java
# web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/UserRepository.java
# web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/DepartmentRepositoryImpl.java
# web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java
|
2025-11-10 18:20:40 +08:00 |
|
SondonYong
|
af9b0f4b52
|
dev:人员导入
|
2025-11-10 18:19:27 +08:00 |
|
zhaokai
|
cd4e708d7a
|
修改忽略文件
|
2025-11-10 17:18:16 +08:00 |
|
zhaokai
|
c0e02f7aa7
|
企业逻辑调整
|
2025-11-10 17:10:19 +08:00 |
|
zhaokai
|
9b5e148211
|
部门增加管理角色，企业逻辑调整
|
2025-11-10 16:33:11 +08:00 |
|
SondonYong
|
22bb8b4929
|
dev:特种/安全证书修改(未完成)
|
2025-11-10 16:19:31 +08:00 |
|
SondonYong
|
bb0bec3639
|
dev:岗位管理去掉关联部门数据权限
|
2025-11-10 14:07:01 +08:00 |
|
SondonYong
|
98b57d9eba
|
dev:特种作业人员管理,安全人员信息管理,人员信息导出接口
|
2025-11-08 17:22:06 +08:00 |
|
zhangyue
|
0e5bf12b9b
|
完善用户履职记录功能
|
2025-11-08 10:58:30 +08:00 |
|
zhaokai
|
0489ce49dd
|
企业调整
|
2025-11-07 18:33:09 +08:00 |
|
SondonYong
|
472bc1c430
|
dev:人员资格证书管理v1.1-实体,CO,DO新增字段
|
2025-11-07 16:41:22 +08:00 |