From 96a893bcc673085f7d6fe3bc5ca7dc34e7ca1db2 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 12 二月 2025 17:44:25 +0800
Subject: [PATCH] flowable模块中的FlowTaskService及controller移动到business模块，完成任务和驳回任务添加日志
---
system/src/main/resources/mapper/system/SysDeptMapper.xml | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/system/src/main/resources/mapper/system/SysDeptMapper.xml b/system/src/main/resources/mapper/system/SysDeptMapper.xml
index cff192d..049098e 100644
--- a/system/src/main/resources/mapper/system/SysDeptMapper.xml
+++ b/system/src/main/resources/mapper/system/SysDeptMapper.xml
@@ -2,9 +2,9 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.hnct.system.mapper.SysDeptMapper">
+<mapper namespace="com.ycl.system.mapper.SysDeptMapper">
- <resultMap type="com.hnct.system.domain.SysDept" id="SysDeptResult">
+ <resultMap type="SysDept" id="SysDeptResult">
<id property="deptId" column="dept_id" />
<result property="parentId" column="parent_id" />
<result property="ancestors" column="ancestors" />
@@ -27,7 +27,7 @@
from sys_dept d
</sql>
- <select id="selectDeptList" parameterType="com.hnct.system.domain.SysDept" resultMap="SysDeptResult">
+ <select id="selectDeptList" parameterType="SysDept" resultMap="SysDeptResult">
<include refid="selectDeptVo"/>
where d.del_flag = '0'
<if test="deptId != null and deptId != 0">
@@ -86,8 +86,14 @@
<include refid="selectDeptVo"/>
where dept_name=#{deptName} and parent_id = #{parentId} and del_flag = '0' limit 1
</select>
+ <select id="selectAncestors" resultType="java.lang.String">
+ select ancestors
+ from sys_user SU
+ INNER JOIN sys_dept SD ON SU.dept_id = SD.dept_id
+ where SU.user_id = #{userId}
+ </select>
- <insert id="insertDept" parameterType="com.hnct.system.domain.SysDept">
+ <insert id="insertDept" parameterType="SysDept">
insert into sys_dept(
<if test="deptId != null and deptId != 0">dept_id,</if>
<if test="parentId != null and parentId != 0">parent_id,</if>
@@ -115,7 +121,7 @@
)
</insert>
- <update id="updateDept" parameterType="com.hnct.system.domain.SysDept">
+ <update id="updateDept" parameterType="SysDept">
update sys_dept
<set>
<if test="parentId != null and parentId != 0">parent_id = #{parentId},</if>
--
Gitblit v1.8.0