Merge 推送至业务 #17

Merged

XiaoLFeng merged 46 commits from develop into master 2024-04-17 00:55:37 +08:00

Conversation 0 Commits 46 Files Changed 116 +3434 -1995

46 Commits

Author	SHA1	Message	Date
XiaoLFeng	0a788005a6	patch: 补丁	2024-04-17 00:52:55 +08:00
XiaoLFeng	87bb3fb069	feat: 添加权限检查功能，增强系统完整	2024-04-17 00:48:26 +08:00
XiaoLFeng	a2cd19675e	refactor: 对权限组的重新配置	2024-04-16 23:56:20 +08:00
XiaoLFeng	f0f6e53ba2	feat: 添加了15个数据表结构定义，调整了部分数据表的创建语句，更新了数据准备脚本。	2024-04-16 22:31:30 +08:00
XiaoLFeng	2086361a8d	Merge branch 'refs/heads/feature-xiaolfeng' into develop	2024-04-16 21:59:50 +08:00
XiaoLFeng	b368dadc3c	fix：调整权限验证逻辑，修复访问空指针问题，优化日志信息，调整审核查询接口字段名称，修正查询接口分页问题。	2024-04-16 21:59:39 +08:00
筱锋xiao_lfeng	fe62d918dc	Merge pull request 'bug:消息修改' (#16) from feature-jie into develop ... Reviewed-on: #16 Reviewed-by: 筱锋xiao_lfeng <gm@x-lf.cn>	2024-04-16 21:59:03 +08:00
XiaoLFeng	e5b87e6f4f	fix: 访问为空以及错误补丁	2024-04-16 21:47:43 +08:00
筱锋xiao_lfeng	49bcadd483	Merge branch 'develop' into feature-jie	2024-04-16 21:39:54 +08:00
筱锋xiao_lfeng	1d914a5217	Merge pull request 'feat：增加新业务功能获取我的审核' (#13) from feature-zrx into develop ... Reviewed-on: #13 Reviewed-by: 筱锋xiao_lfeng <gm@x-lf.cn>	2024-04-16 21:39:25 +08:00
176yunxuan	7db82c57e2	bug:消息修改	2024-04-16 19:40:05 +08:00
xiangZr-hhh	1a65d8ce8f	#patch:补丁 ... 删除多余的log日志	2024-04-16 19:33:42 +08:00
xiangZr-hhh	f3840de509	Merge branch 'develop' of https://git-fy.cn/WxxyDeveloper/JSL_OrganizeInternalOA into feature-zrx ... # Conflicts: # src/main/java/com/jsl/oa/controllers/ReviewController.java # src/main/java/com/jsl/oa/dao/ProjectDAO.java # src/main/java/com/jsl/oa/services/impl/ModuleServiceImpl.java # src/main/java/com/jsl/oa/services/impl/ReviewServiceImpl.java	2024-04-16 19:30:09 +08:00
xiangZr-hhh	cd65a5c6f8	fix:调整查询接口 ... 调整所有审核查询接口的部分字段名称	2024-04-16 19:00:32 +08:00
xiangZr-hhh	cb1d61da88	fix:修正查询接口 ... 分页修正	2024-04-16 18:20:06 +08:00
xiangZr-hhh	36bbaf0995	fix:修正查询接口 ... 修正分页与查询接口	2024-04-16 18:09:16 +08:00
筱锋xiao_lfeng	0c429bc07f	Merge pull request 'fix: 对内容的补丁修复' (#15) from feature-xiaolfeng into develop ... Reviewed-on: #15	2024-04-16 17:31:50 +08:00
XiaoLFeng	76a1cf758c	patch: 优化日志处理模式，删除多余的日志信息	2024-04-16 17:29:21 +08:00
XiaoLFeng	7b1cead10e	refactor: 更新代码以处理未登录异常，优化角色筛选方式，并准备安全相关内容。	2024-04-16 16:44:41 +08:00
xiangZr-hhh	8ab59b5a1d	patch:补丁 ... 修正部分数据表字段，修正对应接口	2024-04-16 16:07:06 +08:00
XiaoLFeng	f153eb221e	Merge branch 'refs/heads/master' into feature-xiaolfeng ... # Conflicts: # src/main/java/com/jsl/oa/controllers/AuthController.java # src/main/java/com/jsl/oa/utils/Processing.java	2024-04-16 15:03:26 +08:00
XiaoLFeng	1f4b85f9b5	feat: 添加初始化设备准备的所需数据	2024-04-16 14:56:41 +08:00
xiangZr-hhh	bc545bbd76	Merge branch 'develop' of https://git-fy.cn/WxxyDeveloper/JSL_OrganizeInternalOA into feature-zrx ... # Conflicts: # src/main/java/com/jsl/oa/mapper/ProjectMapper.java # src/main/java/com/jsl/oa/services/impl/ReviewServiceImpl.java	2024-04-16 14:31:33 +08:00
XiaoLFeng	39ad8a0944	feat: 安全相关的准备	2024-04-14 19:25:00 +08:00
XiaoLFeng	fd22ba9dc6	feat: 新增从项目 id 获取项目详细信息的接口，并实现	2024-04-14 16:15:22 +08:00
筱锋xiao_lfeng	3d7f457ef3	Merge: 初步合并，后续还需要继续进行修改内容 ... Reviewed-on: #14 Reviewed-by: 筱锋xiao_lfeng <gm@x-lf.cn>	2024-04-14 14:55:42 +08:00
XiaoLFeng	aa9efbcc8b	patch: 补丁	2024-04-14 14:54:46 +08:00
XiaoLFeng	05ccc3fdd8	patch: 部分内容进行补丁 ... - 拼写错误 - 未引入部分删除	2024-04-14 14:52:33 +08:00
176yunxuan	55cd033a7e	fix:初步重构	2024-04-13 20:42:42 +08:00
xiangZr-hhh	cd51b261e1	fix:修改申请查询接口 ... 修正部分查询逻辑	2024-04-12 19:24:24 +08:00
xiangZr-hhh	36964d4447	fix:修改添加审核信息、查询审核信息接口 ... 添加审核信息接口：增加判断审核名称是否重复 获取审核信息接口：在子模块名称为空时，返回无，而不是返回null	2024-04-12 19:07:27 +08:00
xiangZr-hhh	49247fd88f	fix:修改审核信息接口 ... 修正xml文件的部分bug	2024-04-12 18:42:06 +08:00
xiangZr-hhh	ec45c0b233	feat：增加新业务功能修改审核状态	2024-04-12 14:28:28 +08:00
xiangZr-hhh	ff34595002	feat：增加新业务功能新增审核	2024-04-12 09:20:51 +08:00
xiangZr-hhh	3b9a7cfe5e	feat：增加新业务功能获取我的审核	2024-04-12 08:20:28 +08:00
XiaoLFeng	5a57ea4b1c	patch: 数据表上传	2024-04-11 23:53:16 +08:00
筱锋xiao_lfeng	383de6766f	Merge pull request 'feat：增加新业务功能获取审核列表' (#10) from feature-zrx into develop ... Reviewed-on: #10 Reviewed-by: 筱锋xiao_lfeng <gm@x-lf.cn>	2024-04-11 20:46:33 +08:00
XiaoLFeng	381de9d54b	patch: 漏洞修补，规范化	2024-04-11 20:22:42 +08:00
XiaoLFeng	061d469c17	Merge branch 'refs/heads/develop' into feature-zrx ... # Conflicts: # src/main/java/com/jsl/oa/aspect/AnnotationsAspect.java # src/main/java/com/jsl/oa/common/constant/SafeConstants.java # src/main/java/com/jsl/oa/controllers/PermissionController.java # src/main/java/com/jsl/oa/controllers/ProjectController.java # src/main/java/com/jsl/oa/controllers/RoleController.java # src/main/java/com/jsl/oa/controllers/UserController.java # src/main/java/com/jsl/oa/dao/ProjectDAO.java # src/main/java/com/jsl/oa/dao/RoleDAO.java # src/main/java/com/jsl/oa/dao/UserDAO.java # src/main/java/com/jsl/oa/mapper/ProjectMapper.java # src/main/java/com/jsl/oa/mapper/RoleMapper.java # src/main/java/com/jsl/oa/mapper/UserMapper.java # src/main/java/com/jsl/oa/services/ProjectService.java # src/main/java/com/jsl/oa/services/impl/AuthServiceImpl.java # src/main/java/com/jsl/oa/services/impl/ProjectServiceImpl.java # src/main/java/com/jsl/oa/services/impl/RoleServiceImpl.java # src/main/java/com/jsl/oa/services/impl/UserServiceImpl.java # src/main/java/com/jsl/oa/utils/Processing.java	2024-04-11 20:17:32 +08:00
筱锋xiao_lfeng	a375bdee78	Merge: 代码规约，Message 部分（消息部分） ... Reviewed-on: #11 Reviewed-by: 筱锋xiao_lfeng <gm@x-lf.cn>	2024-04-11 20:04:11 +08:00
XiaoLFeng	5f0e58ab06	feat: 代码规约修改，BUG 补丁	2024-04-11 19:31:16 +08:00
176yunxuan	b994aeefd8	feat:定时查找快到期项目提醒	2024-04-11 19:10:07 +08:00
xiangZr-hhh	365f2dfa67	feat：增加新业务功能获取审核列表	2024-04-11 17:27:34 +08:00
176yunxuan	3e0652034e	feat:消息模块	2024-04-10 21:10:39 +08:00
176yunxuan	3ca0bed1e1	feat:消息模块	2024-04-10 20:51:48 +08:00
XiaoLFeng	fb5a8c06f6	feat: 代码风格规约调整	2024-04-10 10:34:55 +08:00