From 536dbdec47d839914d34049957e886a282f8a36d Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Fri, 25 Feb 2022 14:43:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.xml | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.xml b/src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.xml
index 136b3ca..a38cd73 100644
--- a/src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.xml
+++ b/src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.xml
@@ -60,7 +60,7 @@
<select id="queryReceiver" resultType="java.util.HashMap">
SELECT u.* ,
r.role_name
- FROM blade_user
+ FROM blade_user u
LEFT JOIN ( SELECT id, role_name FROM blade_role ) r on u.role_id = r.id
WHERE u.id in (${serid})
</select>
@@ -85,15 +85,15 @@
</if>
</select>
- <select id="selectNum" resultType="java.lang.Integer">
- SELECT COUNT(*) as num
+ <select id="selectNum" resultType="java.util.HashMap">
+ SELECT COUNT(*) as num,tasktype
FROM sys_taskqd qd
LEFT JOIN sys_jurisdiction j ON j.id = qd.jurisdiction
WHERE jnum!=num AND qd.rtype = "2" AND
(!find_in_set(#{serid}, serid) OR serid IS NULL )
- and (j.id =#{jurisdiction}
- or
- j.parent_id = #{jurisdiction})
+ and (j.id =#{jurisdiction} or j.parent_id = #{jurisdiction})
+ or (j.id =#{workjurisdiction} or j.parent_id = #{workjurisdiction})
+ GROUP BY tasktype
</select>
<select id="querySerid" resultType="java.lang.String">
--
Gitblit v1.9.3