From 8bfb698ca80914aa7b8e8e22cdeb7fdc7975bc7c Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期六, 15 十月 2022 15:50:01 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' into huacheng_test
---
flower_city/src/main/java/com/dg/core/db/gen/entity/TransactionEvent.java | 1 +
flower_city/src/main/resources/mapper/OrganizationChartMapper.xml | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/entity/TransactionEvent.java b/flower_city/src/main/java/com/dg/core/db/gen/entity/TransactionEvent.java
index a794789..98b319a 100644
--- a/flower_city/src/main/java/com/dg/core/db/gen/entity/TransactionEvent.java
+++ b/flower_city/src/main/java/com/dg/core/db/gen/entity/TransactionEvent.java
@@ -42,6 +42,7 @@
/**
* 部门电话
*/
+ @TableField(exist = false)
@ApiModelProperty("部门电话")
private String contactNumber;
diff --git a/flower_city/src/main/resources/mapper/OrganizationChartMapper.xml b/flower_city/src/main/resources/mapper/OrganizationChartMapper.xml
index 0f6cd25..c91ba2d 100644
--- a/flower_city/src/main/resources/mapper/OrganizationChartMapper.xml
+++ b/flower_city/src/main/resources/mapper/OrganizationChartMapper.xml
@@ -87,8 +87,8 @@
<select id="selectByKeyWord" resultMap="OrganizationChartResult">
<include refid="selectOrganizationChartVo"/>
where organization_name like concat('%', #{keyWord}, '%') or #{keyWord} like concat('%', organization_name, '%')
- or detailed_address like concat('%', #{keyWord}, '%') or #{keyWord} like concat('%', detailed_address, '%')
- or resume like concat('%', #{keyWord}, '%') or #{keyWord} like concat('%', resume, '%')
+ or((detailed_address like concat('%', #{keyWord}, '%') or #{keyWord} like concat('%', detailed_address, '%')) and TRIM(detailed_address) != '')
+ or((resume like concat('%', #{keyWord}, '%') or #{keyWord} like concat('%', resume, '%')) and TRIM(resume) != '' )
</select>
<select id="selectByCode" resultMap="OrganizationChartResult">
--
Gitblit v1.7.1