diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/common/SelectMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/common/SelectMapper.xml
index 6a5c74f5..a3014a72 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/common/SelectMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/common/SelectMapper.xml
@@ -349,7 +349,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
AND bu.unit_id = #{unitId}
- AND bu.dept_id = #{deptId}
+ AND sd.dept_id = #{deptId}
UNION
SELECT DISTINCT
@@ -372,7 +372,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
AND bu.unit_id = #{unitId}
- AND bu.dept_id = #{deptId}
+ AND sd.dept_id = #{deptId}
) a
ORDER BY
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/work/DirectAuditMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/work/DirectAuditMapper.xml
index 96446622..d436f842 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/work/DirectAuditMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/work/DirectAuditMapper.xml
@@ -25,6 +25,7 @@
dai.lease_man as leaseMan ,
swr.workflow_status as flowStatus,
swr.task_id as flowId,
+ swr.task_code as code,
swrs.node_id AS nodeId,
swrs.next_node_id AS nextNodeId,
swrs.record_id AS recordId,
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/work/SysWorkflowRecordMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/work/SysWorkflowRecordMapper.xml
index 65dd70c8..5492f89c 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/work/SysWorkflowRecordMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/work/SysWorkflowRecordMapper.xml
@@ -80,6 +80,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
from sys_workflow_record a
where task_id = #{taskId}
+
+ and a.task_type = #{taskTypeId}
+
LIMIT 1
@@ -95,7 +98,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN sys_workflow_record swr on swr.id = si.business_id
LEFT JOIN uni_org.sys_information_people sp on si.id = sp.information_id
WHERE swr.task_id=#{taskId} and si.web_app_id ="9fa73f046ef520b09e94bbffc3b07702"
-
+
+ and swr.task_type = #{taskTypeId}
+