From a8765eb5005943908901c6163f8e5fd2c577079c Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 08 七月 2025 14:47:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/applet/vo/KnowledgeVO.java | 3 +++
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TUserController.java | 11 ++++++++++-
2 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TUserController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TUserController.java
index 019d65e..b6d3c80 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TUserController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TUserController.java
@@ -644,7 +644,7 @@
@ApiOperation(value = "我的审批-详情")
@GetMapping(value = "/leaveDetail")
- public R<LeaveUserDetailVO> leaveDetail(@RequestParam String id) {
+ public R<LeaveUserDetailVO> leaveDetail(@RequestParam String id) {
TLeave leave = leaveService.getById(id);
LeaveUserDetailVO leaveUserDetailVO = new LeaveUserDetailVO();
SysUser sysUser = sysUserService.selectUserById(Long.parseLong(leave.getLeavePerson()));
@@ -671,6 +671,15 @@
TDept byId = deptService.getById(sysUser.getDeptId());
leaveUserDetailVO.setDeptName(byId.getDeptName());
}
+ if (sysUser.getDeptType()==1){
+ TProjectDept projectDept = projectDeptService.getById(sysUser.getDeptId());
+ if (projectDept.getParentId().equals("0")){
+ leaveUserDetailVO.setDeptName(projectDept.getProjectName());
+ }else{
+ TProjectDept projectDept1 = projectDeptService.getById(projectDept.getParentId());
+ leaveUserDetailVO.setDeptName(projectDept1.getProjectName()+">"+projectDept.getProjectName());
+ }
+ }
leaveUserDetailVO.setLeavePersonName(sysUser.getNickName());
LeaveAuditListVO leaveAuditListVO = new LeaveAuditListVO();
List<TLeaveAudit> list = leaveAuditService.list(new LambdaQueryWrapper<TLeaveAudit>()
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/applet/vo/KnowledgeVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/applet/vo/KnowledgeVO.java
index 338e293..9f946cd 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/applet/vo/KnowledgeVO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/applet/vo/KnowledgeVO.java
@@ -28,6 +28,9 @@
@ApiModelProperty(value = "浏览量")
@TableField("views")
private Integer views;
+ @ApiModelProperty(value = "内容")
+ @TableField("content")
+ private String content;
@ApiModelProperty(value = "状态 1启用 2禁用")
@TableField("status")
--
Gitblit v1.7.1