From fd7b9aabefdcfa4e2f8504c77d5a4e6f4f955585 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Sun, 22 Aug 2021 14:50:28 +0800
Subject: [PATCH] 1.ftp
---
src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
index 4f6869f..221ab9c 100644
--- a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
+++ b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
@@ -101,7 +101,7 @@
LEFT JOIN blade_dept d ON d.id= u.dept_id
LEFT JOIN sys_jurisdiction j ON j.id= u.jurisdiction
WHERE
- hold = 1
+ hold = 2
<if test="jurisdiction!=null and jurisdiction!=''">
and u.jurisdiction =#{jurisdiction}
</if>
@@ -539,7 +539,7 @@
jurisdiction
FROM blade_user
WHERE role_id = '1412226235153731586'
- AND hold = 0
+ AND hold = 1
AND DATE_FORMAT( create_time, '%Y%m' ) = DATE_FORMAT( CURDATE( ), '%Y%m' )
GROUP BY dept_id,
jurisdiction
@@ -551,7 +551,7 @@
jurisdiction
FROM blade_user
WHERE role_id = '1412226235153731586'
- AND hold = 0
+ AND hold = 1
AND PERIOD_DIFF( date_format( now( ), '%Y%m' ), date_format( create_time, '%Y%m' ) ) = 1
GROUP BY dept_id,
jurisdiction
@@ -780,7 +780,7 @@
GROUP BY
i.departmentid
)
- AND role_id='1412226235153731586' AND hold=0
+ AND role_id='1412226235153731586' AND hold=1
<if test="deptid!=null and deptid!=''">
and dept_id =#{deptid}
</if>
@@ -861,7 +861,7 @@
FROM blade_user u
LEFT JOIN blade_dept d ON d.id = u.dept_id
LEFT JOIN sys_jurisdiction j ON j.id = u.jurisdiction
- WHERE u.examination_type = 1
+ WHERE u.examination_type = 1 and is_deleted=0
<if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1123598813738675201'">
and u.jurisdiction =#{jurisdiction}
</if>
@@ -986,7 +986,7 @@
blade_user
WHERE
role_id = '1412226235153731586'
- AND hold=0
+ AND hold=1
GROUP BY
dept_id,
jurisdiction
@@ -1136,7 +1136,7 @@
jurisdiction
FROM blade_user
WHERE role_id = '1412226235153731586'
- AND hold = 0
+ AND hold = 1
GROUP BY dept_id,
jurisdiction
) D ON A.departmentid = D.dept_id
--
Gitblit v1.9.3