From 6947c8ed7b241e1d85f49a1c2bd6bff291b17dbf Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 13 二月 2025 21:26:40 +0800
Subject: [PATCH] mybatisplus版本升级支持通用枚举、新增部门树、用户列表的无数据权限接口
---
start/src/main/java/com/ycl/web/controller/system/SysUserController.java | 20 ++++++++++++++++++++
business/src/main/java/com/ycl/event/listener/ProcessLogEventListener.java | 1 +
flowable/src/main/java/com/ycl/domain/vo/ProcessLogVO.java | 2 +-
system/src/main/java/com/ycl/system/service/ISysUserService.java | 2 ++
flowable/src/main/resources/mapper/ProcessLogMapper.xml | 8 ++++----
pom.xml | 2 +-
system/src/main/java/com/ycl/system/service/impl/SysDeptServiceImpl.java | 6 ++++++
system/src/main/java/com/ycl/system/service/ISysDeptService.java | 3 +++
system/src/main/java/com/ycl/system/service/impl/SysUserServiceImpl.java | 5 +++++
9 files changed, 43 insertions(+), 6 deletions(-)
diff --git a/business/src/main/java/com/ycl/event/listener/ProcessLogEventListener.java b/business/src/main/java/com/ycl/event/listener/ProcessLogEventListener.java
index 6ea4c6b..879e30f 100644
--- a/business/src/main/java/com/ycl/event/listener/ProcessLogEventListener.java
+++ b/business/src/main/java/com/ycl/event/listener/ProcessLogEventListener.java
@@ -4,6 +4,7 @@
import com.ycl.common.utils.SecurityUtils;
import com.ycl.domain.entity.ProcessLog;
import com.ycl.event.event.TaskLogEvent;
+import com.ycl.service.ProcessLogService;
import lombok.RequiredArgsConstructor;
import org.springframework.context.event.EventListener;
import org.springframework.stereotype.Component;
diff --git a/flowable/src/main/java/com/ycl/domain/vo/ProcessLogVO.java b/flowable/src/main/java/com/ycl/domain/vo/ProcessLogVO.java
index 1cab38f..e12e7bd 100644
--- a/flowable/src/main/java/com/ycl/domain/vo/ProcessLogVO.java
+++ b/flowable/src/main/java/com/ycl/domain/vo/ProcessLogVO.java
@@ -33,7 +33,7 @@
/** 娴佺▼瀹炰緥id */
@ApiModelProperty("娴佺▼瀹炰緥id")
- private String flowInsId;
+ private String processInsId;
/** 浜х敓鏃ュ織鐨勪汉/鎴栧叾瀹� */
@ApiModelProperty("浜х敓鏃ュ織鐨勪汉/鎴栧叾瀹�")
diff --git a/flowable/src/main/resources/mapper/ProcessLogMapper.xml b/flowable/src/main/resources/mapper/ProcessLogMapper.xml
index cea40f0..78dc89a 100644
--- a/flowable/src/main/resources/mapper/ProcessLogMapper.xml
+++ b/flowable/src/main/resources/mapper/ProcessLogMapper.xml
@@ -7,7 +7,7 @@
<result column="task_id" property="taskId" />
<result column="event_type" property="eventType" typeHandler="com.baomidou.mybatisplus.core.handlers.MybatisEnumTypeHandler"/>
<result column="project_id" property="projectId" />
- <result column="flow_ins_id" property="flowInsId" />
+ <result column="process_ins_id" property="processInsId" />
<result column="user_id" property="userId" />
<result column="nick_name" property="nickName" />
<result column="gmt_create" property="gmtCreate" />
@@ -25,7 +25,7 @@
TFL.task_id,
TFL.event_type,
TFL.project_id,
- TFL.flow_ins_id,
+ TFL.process_ins_id,
TFL.user_id,
TFL.event_data_json,
TFL.id
@@ -41,7 +41,7 @@
TFL.task_id,
TFL.event_type,
TFL.project_id,
- TFL.flow_ins_id,
+ TFL.process_ins_id,
TFL.user_id,
TFL.event_data_json,
TFL.gmt_create,
@@ -58,7 +58,7 @@
TFL.task_id,
TFL.event_type,
TFL.project_id,
- TFL.flow_ins_id,
+ TFL.process_ins_id,
TFL.user_id,
SU.nick_name,
TFL.event_data_json,
diff --git a/pom.xml b/pom.xml
index 11f420a..f555698 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
<poi.version>4.1.2</poi.version>
<velocity.version>2.3</velocity.version>
<jwt.version>0.9.1</jwt.version>
- <mybatisplus.version>3.5.1</mybatisplus.version>
+ <mybatisplus.version>3.5.4.1</mybatisplus.version>
<lombok.version>1.18.24</lombok.version>
<easyEacel.version>3.3.2</easyEacel.version>
<knife.version>3.0.3</knife.version>
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 8ab3e24..08d405b 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
@@ -63,6 +63,17 @@
return getDataTable(list);
}
+ /**
+ * 鑾峰彇鐢ㄦ埛鍒楄〃 鏃犳暟鎹潈闄�
+ */
+// @PreAuthorize("@ss.hasPermi('system:user:list')")
+ @GetMapping("/list/no-data-auth")
+ public TableDataInfo listNoAuth(SysUser user) {
+ startPage();
+ List<SysUser> list = userService.selectUserListNoAuth(user);
+ return getDataTable(list);
+ }
+
@Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.EXPORT)
@PreAuthorize("@ss.hasPermi('system:user:export')")
@PostMapping("/export")
@@ -224,6 +235,15 @@
}
/**
+ * 鑾峰彇閮ㄩ棬鏍戝垪琛� 鏃犳暟鎹潈闄�
+ */
+// @PreAuthorize("@ss.hasPermi('system:user:list')")
+ @GetMapping("/deptTree/no-data-auth")
+ public AjaxResult deptTreeNoDataAuth(SysDept dept) {
+ return success(deptService.deptTreeNoDataAuth(dept));
+ }
+
+ /**
* 鑾峰彇閮ㄩ棬鏍戝垪琛紝娴佺▼閰嶇疆浣跨敤
*/
// @PreAuthorize("@ss.hasPermi('system:user:list')")
diff --git a/system/src/main/java/com/ycl/system/service/ISysDeptService.java b/system/src/main/java/com/ycl/system/service/ISysDeptService.java
index 4e9bdcc..06c068a 100644
--- a/system/src/main/java/com/ycl/system/service/ISysDeptService.java
+++ b/system/src/main/java/com/ycl/system/service/ISysDeptService.java
@@ -30,6 +30,9 @@
*/
public List<TreeSelect> selectDeptTreeList(SysDept dept);
+
+ public List<TreeSelect> deptTreeNoDataAuth(SysDept dept);
+
/**
* 娴佺▼閰嶇疆浣跨敤--鏍戠粨鏋�
*
diff --git a/system/src/main/java/com/ycl/system/service/ISysUserService.java b/system/src/main/java/com/ycl/system/service/ISysUserService.java
index 5d32714..0ed4f8f 100644
--- a/system/src/main/java/com/ycl/system/service/ISysUserService.java
+++ b/system/src/main/java/com/ycl/system/service/ISysUserService.java
@@ -18,6 +18,8 @@
*/
public List<SysUser> selectUserList(SysUser user);
+ public List<SysUser> selectUserListNoAuth(SysUser user);
+
/**
* 鏍规嵁鏉′欢鍒嗛〉鏌ヨ宸插垎閰嶇敤鎴疯鑹插垪琛�
*
diff --git a/system/src/main/java/com/ycl/system/service/impl/SysDeptServiceImpl.java b/system/src/main/java/com/ycl/system/service/impl/SysDeptServiceImpl.java
index 2230c2a..b24b1ea 100644
--- a/system/src/main/java/com/ycl/system/service/impl/SysDeptServiceImpl.java
+++ b/system/src/main/java/com/ycl/system/service/impl/SysDeptServiceImpl.java
@@ -64,6 +64,12 @@
}
@Override
+ public List<TreeSelect> deptTreeNoDataAuth(SysDept dept) {
+ List<SysDept> depts = deptMapper.selectDeptList(dept);;
+ return buildDeptTreeSelect(depts);
+ }
+
+ @Override
public List<StringTreeSelect> flowDeptTree(SysDept dept) {
List<SysDept> depts = deptMapper.selectDeptList(dept);
List<StringTreeSelect> list = depts.stream().map(item -> {
diff --git a/system/src/main/java/com/ycl/system/service/impl/SysUserServiceImpl.java b/system/src/main/java/com/ycl/system/service/impl/SysUserServiceImpl.java
index 37acd5a..d78a816 100644
--- a/system/src/main/java/com/ycl/system/service/impl/SysUserServiceImpl.java
+++ b/system/src/main/java/com/ycl/system/service/impl/SysUserServiceImpl.java
@@ -74,6 +74,11 @@
return userMapper.selectUserList(user);
}
+ @Override
+ public List<SysUser> selectUserListNoAuth(SysUser user) {
+ return userMapper.selectUserList(user);
+ }
+
/**
* 鏍规嵁鏉′欢鍒嗛〉鏌ヨ宸插垎閰嶇敤鎴疯鑹插垪琛�
*
--
Gitblit v1.8.0