From fc079917ee5e1dddfc2e873acdefc33483b9fe44 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Sun, 22 Aug 2021 17:18:10 +0800
Subject: [PATCH] 1.单位
---
src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 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..fe78355 100644
--- a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
+++ b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
@@ -26,6 +26,8 @@
<result column="representativecell" property="representativecell"/>
<result column="contacts" property="contacts"/>
<result column="contactscell" property="contactscell"/>
+ <result column="businessLicense" property="businessLicense"/>
+ <result column="licence" property="licence"/>
</resultMap>
@@ -101,7 +103,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 +541,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 +553,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 +782,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 +863,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 u.is_deleted=0
<if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1123598813738675201'">
and u.jurisdiction =#{jurisdiction}
</if>
@@ -986,7 +988,7 @@
blade_user
WHERE
role_id = '1412226235153731586'
- AND hold=0
+ AND hold=1
GROUP BY
dept_id,
jurisdiction
@@ -1059,7 +1061,6 @@
<if test="deptid!=null and deptid!=''">
and A.dept_id =#{deptid}
</if>
- limit #{current},#{size};
</select>
<select id="seCountI" resultType="java.util.HashMap">
@@ -1136,7 +1137,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