From b17b0e4d165d3d5cc272bd796e0dc315847de1a9 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 12 二月 2025 15:58:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
business/src/main/java/com/ycl/domain/json/JumpData.java | 22 ++++++++++++++++++++++
start/src/main/java/com/ycl/web/controller/system/SysRoleController.java | 2 +-
business/src/main/java/com/ycl/domain/form/TaskJumpForm.java | 3 +++
start/src/main/java/com/ycl/web/controller/system/SysUserController.java | 4 ++--
business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java | 3 ++-
5 files changed, 30 insertions(+), 4 deletions(-)
diff --git a/business/src/main/java/com/ycl/domain/form/TaskJumpForm.java b/business/src/main/java/com/ycl/domain/form/TaskJumpForm.java
index 7546c9e..c1868d0 100644
--- a/business/src/main/java/com/ycl/domain/form/TaskJumpForm.java
+++ b/business/src/main/java/com/ycl/domain/form/TaskJumpForm.java
@@ -29,4 +29,7 @@
@ApiModelProperty("娴佺▼瀹炰緥id锛岀敤浜庝繚瀛樻棩蹇�")
private String processInsId;
+
+ @ApiModelProperty("璇存槑")
+ private String desc;
}
diff --git a/business/src/main/java/com/ycl/domain/json/JumpData.java b/business/src/main/java/com/ycl/domain/json/JumpData.java
new file mode 100644
index 0000000..f3414ea
--- /dev/null
+++ b/business/src/main/java/com/ycl/domain/json/JumpData.java
@@ -0,0 +1,22 @@
+package com.ycl.domain.json;
+
+import lombok.Data;
+
+/**
+ * 璺宠繃浠诲姟
+ *
+ * @author锛歺p
+ * @date锛�2025/2/12 13:43
+ */
+@Data
+public class JumpData {
+
+
+ /** 鎯呭喌璇存槑 */
+ private String desc;
+
+
+ public JumpData(String desc) {
+ this.desc = desc;
+ }
+}
diff --git a/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java b/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java
index 410ca94..6f84aa6 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java
@@ -24,6 +24,7 @@
import com.ycl.domain.form.TaskJumpForm;
import com.ycl.domain.form.TaskSuperviseForm;
import com.ycl.domain.json.DelegateData;
+import com.ycl.domain.json.JumpData;
import com.ycl.domain.json.SuperviseData;
import com.ycl.domain.vo.CustomerTaskVO;
import com.ycl.domain.vo.IndexCustomerTaskVO;
@@ -621,7 +622,7 @@
Task task = taskService.createTaskQuery().taskId(form.getTaskId()).processInstanceId(form.getProcessInsId()).singleResult();
if (Objects.nonNull(task)) {
// 娣诲姞璺宠繃鏃ュ織
- publisher.publishEvent(new TaskLogEvent(this, null,SecurityUtils.getUserId(), form.getProjectId(), form.getProcessInsId(), form.getTaskId(), ProcessLogEventTypeEnum.JUMP, null));
+ publisher.publishEvent(new TaskLogEvent(this, null,SecurityUtils.getUserId(), form.getProjectId(), form.getProcessInsId(), form.getTaskId(), ProcessLogEventTypeEnum.JUMP, new JumpData(form.getDesc())));
// 鏌ュ嚭璇ヤ换鍔＄粦瀹氱殑琛ㄥ崟
Map<String, Object> data = new HashMap<>(1);
diff --git a/start/src/main/java/com/ycl/web/controller/system/SysRoleController.java b/start/src/main/java/com/ycl/web/controller/system/SysRoleController.java
index 1702ffe..6bfe18c 100644
--- a/start/src/main/java/com/ycl/web/controller/system/SysRoleController.java
+++ b/start/src/main/java/com/ycl/web/controller/system/SysRoleController.java
@@ -53,7 +53,7 @@
private final ISysDeptService deptService;
- @PreAuthorize("@ss.hasPermi('system:role:list')")
+// @PreAuthorize("@ss.hasPermi('system:role:list')")
@GetMapping("/list")
public TableDataInfo list(SysRole role) {
startPage();
diff --git a/start/src/main/java/com/ycl/web/controller/system/SysUserController.java b/start/src/main/java/com/ycl/web/controller/system/SysUserController.java
index 98c0d3c..8ab3e24 100644
--- a/start/src/main/java/com/ycl/web/controller/system/SysUserController.java
+++ b/start/src/main/java/com/ycl/web/controller/system/SysUserController.java
@@ -55,7 +55,7 @@
/**
* 鑾峰彇鐢ㄦ埛鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('system:user:list')")
+// @PreAuthorize("@ss.hasPermi('system:user:list')")
@GetMapping("/list")
public TableDataInfo list(SysUser user) {
startPage();
@@ -217,7 +217,7 @@
/**
* 鑾峰彇閮ㄩ棬鏍戝垪琛�
*/
- @PreAuthorize("@ss.hasPermi('system:user:list')")
+// @PreAuthorize("@ss.hasPermi('system:user:list')")
@GetMapping("/deptTree")
public AjaxResult deptTree(SysDept dept) {
return success(deptService.selectDeptTreeList(dept));
--
Gitblit v1.8.0