Commit Graph

57 Commits

Author SHA1 Message Date
dxfeng f79ad8681f BUG修复 2023-01-12 16:49:54 +08:00
dxfeng 1db4a85d46 BUG修复 2022-12-15 16:13:21 +08:00
dxfeng 85ec966813 人员卡片查看页面逻辑重写 2022-12-05 17:57:33 +08:00
dxfeng 9a2eabc8bd 部门切换数据源、实体类更新 2022-11-29 09:54:18 +08:00
dxfeng 17f4789e33 BUG修复 2022-11-16 14:59:22 +08:00
dxfeng 05364f9265 BUG修复 2022-11-16 13:39:56 +08:00
dxfeng 16794bf98c 人员卡片按钮保存 2022-11-11 16:24:26 +08:00
dxfeng b0021dae20 字段允许个人修改 2022-11-09 11:07:55 +08:00
dxfeng a3a0ce8046 岗位按钮、人员字段权限 2022-11-08 17:26:59 +08:00
dxfeng 679c77f732 组织架构图相关BUG修复 2022-10-26 20:12:14 +08:00
dxfeng 8e385537da BUG修复 2022-09-09 10:25:57 +08:00
dxfeng 2744f85eff BUG修复 2022-08-29 11:07:10 +08:00
dxfeng 477a2f3bce 自定义字段BUG修复 2022-08-22 13:35:21 +08:00
dxfeng 3acec4730d BUG修复,权限控制 2022-08-17 19:29:46 +08:00
dxfeng f27612db94 Oracle BUG修复 2022-08-11 10:43:52 +08:00
dxfeng 36ce009929 非标脚本完善,BUG修复 2022-08-04 10:29:29 +08:00
dxfeng fa663a1eaa 岗位浏览按钮优化 2022-07-18 13:27:15 +08:00
dxfeng 58e9f0ebb8 初始化SQL提交 2022-07-15 16:49:54 +08:00
dxfeng 3c74268126 岗位浏览按钮 2022-07-15 14:42:31 +08:00
dxfeng 26ef362eb4 组织导入 2022-06-30 11:17:59 +08:00
Chengliang 82aa37e2ed bug修复 增加导入 2022-06-27 16:26:48 +08:00
dxfeng 6c40245b02 组织人事测试、优化 2022-06-23 16:55:26 +08:00
dxfeng 187be45bdf 人员管理:左侧树、列表接口 2022-06-21 13:49:37 +08:00
dxfeng abf99aaa51 BUG修复 2022-06-20 14:50:59 +08:00
Chengliang 95744654b7 优化 2022-06-20 09:48:17 +08:00
dxfeng 6df1accb98 BUG 修复 2022-06-17 16:54:16 +08:00
dxfeng caff3332ce BUG 修复 2022-06-17 14:19:52 +08:00
dxfeng e9aa68229d 表结构更新 2022-06-17 11:48:15 +08:00
dxfeng 445507d10d 表结构更新 2022-06-17 10:54:59 +08:00
dxfeng c8604a8e40 数据返回格式修改 2022-06-17 09:45:32 +08:00
dxfeng 9aebfbcecc 字段删除 移动分组 2022-06-16 18:26:12 +08:00
dxfeng eb9c77b2d0 Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf
 Conflicts:
	src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java
	src/com/engine/organization/web/FieldDefinedController.java
	src/com/engine/organization/wrapper/FieldDefinedWrapper.java
2022-06-16 18:04:32 +08:00
Chengliang 6d4448ec51 子信息维护 2022-06-16 17:57:03 +08:00
dxfeng 4d2a70ad5d 自定义字段列表接口 2022-06-16 17:53:48 +08:00
dxfeng 08ca2e0c5d 自定义字段列表 2022-06-16 16:10:33 +08:00
dxfeng 52c964f199 添加自定义字段接口 2022-06-16 14:19:54 +08:00
dxfeng e588fb0c96 BUG修复 2022-06-16 09:37:36 +08:00
dxfeng 3f151d55e6 Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf
 Conflicts:
	src/com/engine/organization/entity/extend/bo/ExtendGroupBO.java
	src/com/engine/organization/service/FieldDefinedService.java
	src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java
	src/com/engine/organization/web/FieldDefinedController.java
	src/com/engine/organization/wrapper/FieldDefinedWrapper.java
2022-06-15 18:09:26 +08:00
dxfeng 7c02e9bc61 分组删除 新增自定义字段 2022-06-15 18:03:01 +08:00
Chengliang 8564d29bf1 新增类型默认title 2022-06-15 17:56:29 +08:00
Chengliang f4f7038611 新增编辑类型 2022-06-15 17:17:34 +08:00
dxfeng c8112bd701
!82 分组维护 新建分组
Merge pull request !82 from dxfeng/feature/dxf
2022-06-15 03:26:31 +00:00
dxfeng b4b54fa1e1 分组维护 新建分组 2022-06-15 11:25:23 +08:00
reset 07cb72c05c
!80 11
Merge pull request !80 from reset/feature/cl
2022-06-14 10:01:35 +00:00
Chengliang cde0608e02 自定义树页面修好 2022-06-14 18:00:51 +08:00
dxfeng 079addd6c7 Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf
 Conflicts:
	src/com/engine/organization/service/FieldDefinedService.java
	src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java
2022-06-14 17:56:26 +08:00
reset 6e7c76ac0d
!78 自定义设置页面树
Merge pull request !78 from reset/feature/cl
2022-06-14 08:11:40 +00:00
Chengliang 6b1ce95b48 自定义设置页面树 2022-06-14 16:10:26 +08:00
dxfeng 9259596e54 自定义字段 getTabInfo 2022-06-14 15:29:22 +08:00
dxfeng 2ed79cc994 添加字段分组表 2022-06-14 13:58:58 +08:00