From 764d883b5ea3bdc06abbec548b6df0511e567978 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Tue, 03 Sep 2024 09:46:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/binlog' into binlog
---
src/main/java/org/springblade/modules/backblast/mapper/BackblastWarnHanRecMapper.xml | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/backblast/mapper/BackblastWarnHanRecMapper.xml b/src/main/java/org/springblade/modules/backblast/mapper/BackblastWarnHanRecMapper.xml
index 48da13d..3aef29d 100644
--- a/src/main/java/org/springblade/modules/backblast/mapper/BackblastWarnHanRecMapper.xml
+++ b/src/main/java/org/springblade/modules/backblast/mapper/BackblastWarnHanRecMapper.xml
@@ -12,11 +12,14 @@
jbwhr.*,
br.town_name as townName,
br.name as communityName,
- jpag.pcs_name pcsName
+ jpag.pcs_name pcsName,
+ bd.dept_name
from jczz_backblast_warn_han_rec jbwhr
LEFT JOIN jczz_grid jg on jg.grid_code = jbwhr.grid_code and jg.is_deleted = 0
LEFT JOIN jczz_police_affairs_grid jpag on jbwhr.jw_grid_code= jpag.jw_grid_code and jpag.is_deleted = 0
LEFT JOIN blade_region br on br.code = jpag.community_code
+ LEFT JOIN blade_user bu ON bu.id = jbwhr.create_user
+ LEFT JOIN blade_dept bd on bd.id = bu.dept_id
where jbwhr.is_deleted = 0
<if test="backblastWarnHanRec.townName != null and backblastWarnHanRec.townName != ''">
and br.town_name like concat('%',#{backblastWarnHanRec.townName},'%')
@@ -48,6 +51,12 @@
<if test="backblastWarnHanRec.endTime != null and backblastWarnHanRec.endTime != ''">
and date_format(jbwhr.create_time,'%Y-%m-%d') <= #{backblastWarnHanRec.endTime}
</if>
+ <if test="backblastWarnHanRec.createUser != null">
+ and jbwhr.create_user = #{backblastWarnHanRec.createUser}
+ </if>
+ <if test="backblastWarnHanRec.deptName != null and backblastWarnHanRec.deptName != ''">
+ and bd.dept_name like concat('%',#{backblastWarnHanRec.deptName},'%')
+ </if>
<if test="backblastWarnHanRec.searchKey!=null and backblastWarnHanRec.searchKey!=''">
and CONCAT(
ifnull(jbwhr.policeman_phone,''),
--
Gitblit v1.9.3