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

XiaoLFeng commented 2024-04-17 00:53:56 +08:00

Owner

Copy Link

No description provided.

XiaoLFeng added 46 commits 2024-04-17 00:53:56 +08:00

feat: 代码风格规约调整 fb5a8c06f6

feat:消息模块 3ca0bed1e1

feat:消息模块 3e0652034e

feat：增加新业务功能获取审核列表 365f2dfa67

feat:定时查找快到期项目提醒 b994aeefd8

feat: 代码规约修改，BUG 补丁 5f0e58ab06

Merge: 代码规约，Message 部分（消息部分） ... a375bdee78

Reviewed-on: #11
Reviewed-by: 筱锋xiao_lfeng <gm@x-lf.cn>

Merge branch 'refs/heads/develop' into feature-zrx ... 061d469c17

# 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

patch: 漏洞修补，规范化 381de9d54b

Merge pull request 'feat：增加新业务功能获取审核列表' (#10) from feature-zrx into develop ... 383de6766f

Reviewed-on: #10
Reviewed-by: 筱锋xiao_lfeng <gm@x-lf.cn>

patch: 数据表上传 5a57ea4b1c

feat：增加新业务功能获取我的审核 3b9a7cfe5e

feat：增加新业务功能新增审核 ff34595002

feat：增加新业务功能修改审核状态 ec45c0b233

fix:修改审核信息接口 ... 49247fd88f

修正xml文件的部分bug

fix:修改添加审核信息、查询审核信息接口 ... 36964d4447

添加审核信息接口：增加判断审核名称是否重复
获取审核信息接口：在子模块名称为空时，返回无，而不是返回null

fix:修改申请查询接口 ... cd51b261e1

修正部分查询逻辑

fix:初步重构 55cd033a7e

patch: 部分内容进行补丁 ... 05ccc3fdd8

- 拼写错误
- 未引入部分删除

patch: 补丁 aa9efbcc8b

Merge: 初步合并，后续还需要继续进行修改内容 ... 3d7f457ef3

Reviewed-on: #14
Reviewed-by: 筱锋xiao_lfeng <gm@x-lf.cn>

feat: 新增从项目 id 获取项目详细信息的接口，并实现 fd22ba9dc6

feat: 安全相关的准备 39ad8a0944

Merge branch 'develop' of https://git-fy.cn/WxxyDeveloper/JSL_OrganizeInternalOA into feature-zrx ... bc545bbd76

# Conflicts:
#	src/main/java/com/jsl/oa/mapper/ProjectMapper.java
#	src/main/java/com/jsl/oa/services/impl/ReviewServiceImpl.java

feat: 添加初始化设备准备的所需数据 1f4b85f9b5

Merge branch 'refs/heads/master' into feature-xiaolfeng ... f153eb221e

# Conflicts:
#	src/main/java/com/jsl/oa/controllers/AuthController.java
#	src/main/java/com/jsl/oa/utils/Processing.java

patch:补丁 ... 8ab59b5a1d

修正部分数据表字段，修正对应接口

refactor: 更新代码以处理未登录异常，优化角色筛选方式，并准备安全相关内容。 7b1cead10e

patch: 优化日志处理模式，删除多余的日志信息 76a1cf758c

Merge pull request 'fix: 对内容的补丁修复' (#15) from feature-xiaolfeng into develop ... 0c429bc07f

Reviewed-on: #15

fix:修正查询接口 ... 36bbaf0995

修正分页与查询接口

fix:修正查询接口 ... cb1d61da88

分页修正

fix:调整查询接口 ... cd65a5c6f8

调整所有审核查询接口的部分字段名称

Merge branch 'develop' of https://git-fy.cn/WxxyDeveloper/JSL_OrganizeInternalOA into feature-zrx ... f3840de509

# 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

#patch:补丁 ... 1a65d8ce8f

删除多余的log日志

bug:消息修改 7db82c57e2

Merge pull request 'feat：增加新业务功能获取我的审核' (#13) from feature-zrx into develop ... 1d914a5217

Reviewed-on: #13
Reviewed-by: 筱锋xiao_lfeng <gm@x-lf.cn>

Merge branch 'develop' into feature-jie 49bcadd483

fix: 访问为空以及错误补丁 e5b87e6f4f

Merge pull request 'bug:消息修改' (#16) from feature-jie into develop ... fe62d918dc

Reviewed-on: #16
Reviewed-by: 筱锋xiao_lfeng <gm@x-lf.cn>

fix：调整权限验证逻辑，修复访问空指针问题，优化日志信息，调整审核查询接口字段名称，修正查询接口分页问题。 b368dadc3c

Merge branch 'refs/heads/feature-xiaolfeng' into develop 2086361a8d

feat: 添加了15个数据表结构定义，调整了部分数据表的创建语句，更新了数据准备脚本。 f0f6e53ba2

refactor: 对权限组的重新配置 a2cd19675e

feat: 添加权限检查功能，增强系统完整 87bb3fb069

patch: 补丁 0a788005a6

XiaoLFeng merged commit 65a13ff549 into master 2024-04-17 00:55:37 +08:00

XiaoLFeng referenced this issue from a commit 2024-04-17 00:55:37 +08:00

Merge pull request 'Merge 推送至业务' (#17) from develop into master

Sign in to join this conversation.

Reviewers

No Reviewers

Labels

Clear labels

bug

Something is not working

duplicate

This issue or pull request already exists

enhancement

New feature

help wanted

Need some help

invalid

Something is wrong

question

More information is needed

wontfix

This won't be fixed

No Label

Milestone

No items

No Milestone

Projects

Clear projects

No project

Assignees

Clear assignees

362612387 Jenkins tuxiu21 weiduidui XCYH xiangZr-hhh XiaoLFeng yangna_guji yannqing

No Assignees

1 Participants

Notifications

Subscribe

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: WxxyDeveloper/JSL_OrganizeInternalOA#17

No description provided.