From 547d68b874dc4bb51d6ac39cc0fec2c227028ef0 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期四, 07 十二月 2023 09:08:28 +0800
Subject: [PATCH] 修改
---
zt/core/src/main/resources/mapper/workflowconfig/WfDefStepDao.xml | 33 ++++++++++++++++-----------------
1 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/zt/core/src/main/resources/mapper/workflowconfig/WfDefStepDao.xml b/zt/core/src/main/resources/mapper/workflowconfig/WfDefStepDao.xml
index 6075da2..bb0eaef 100644
--- a/zt/core/src/main/resources/mapper/workflowconfig/WfDefStepDao.xml
+++ b/zt/core/src/main/resources/mapper/workflowconfig/WfDefStepDao.xml
@@ -47,9 +47,9 @@
d.dept_name AS companyName
FROM
WF_DEF_STEP a
- LEFT JOIN SYS_USER b ON instr(a.APPROVER_IDS,b.user_id) > 0
- LEFT JOIN SYS_DEPT c ON b.dept_id = c.dept_id
- LEFT JOIN SYS_DEPT d ON b.COMPANY_ID = d.dept_id
+ LEFT JOIN SYS_USER b ON instr(a.APPROVER_IDS,b.id) > 0
+ LEFT JOIN SYS_DEPT c ON b.dept_id = c.id
+ LEFT JOIN SYS_DEPT d ON b.COMPANY_ID = d.id
WHERE
a.is_delete = 0
AND a.id = #{stepsId}
@@ -57,11 +57,10 @@
<select id="getUserList" resultType="com.zt.modules.workflowconfig.model.WfDefStep">
SELECT
- a.user_id AS userId,
- a.user_name AS userName,
- a.nick_name AS realName,
- c.dept_name AS deptName,
- d.dept_name AS companyName
+ a.id AS userId,
+ a.username AS userName,
+ a.real_name AS realName,
+ c.name AS deptName
FROM
(
SELECT
@@ -78,12 +77,12 @@
and ${whereSql}
</if>
<if test="userName != '' and userName != null">
- and a.user_name like concat('%',#{userName},'%')
+ and a.name like concat('%',#{userName},'%')
</if>
- AND a.del_flag = 0
- ORDER BY a.user_name
+ AND a.is_delete = 0
+ ORDER BY a.name
) a
- LEFT JOIN SYS_DEPT c ON a.dept_id = c.dept_id
+ LEFT JOIN SYS_DEPT c ON a.dept_id = c.id
</select>
<update id="addWorkflowStepsUser">
@@ -103,11 +102,11 @@
a.id as stepId,
b.id as roleId,
b.name as roleName,
- d.dept_name AS companyName
+ d.name AS companyName
FROM
WF_DEF_STEP a
LEFT JOIN SYS_ROLE b ON instr(a.APPROVER_ROLE_IDS,b.id) > 0
- LEFT JOIN SYS_DEPT d ON b.COMPANY_ID = d.dept_id
+ LEFT JOIN SYS_DEPT d ON b.COMPANY_ID = d.id
WHERE
a.is_delete = 0
AND a.id = #{stepsId}
@@ -117,7 +116,7 @@
SELECT
a.id AS roleId,
a.name AS roleName,
- d.dept_name AS companyName
+ d.name AS companyName
FROM
(
SELECT
@@ -139,8 +138,8 @@
AND a.is_delete = 0
) a
- LEFT JOIN SYS_DEPT d ON a.COMPANY_ID = d.dept_id
- ORDER BY d.dept_name, a.sort
+ LEFT JOIN SYS_DEPT d ON a.COMPANY_ID = d.id
+ ORDER BY d.name, a.sort
</select>
<update id="addWorkflowStepsRole">
--
Gitblit v1.9.1