From 62084735c1f5d6b6d4771aadf4d9241479a4d4ee Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 24 Oct 2022 15:06:16 +0800
Subject: [PATCH] 用户查询增加模糊查询；修复当编辑用户时账号解封的问题；全景管理查询未删除的数据；当性别，生日未填时数据库同时也录入数据
---
src/main/java/org/springblade/modules/retrieval/mapper/RetrievalMapper.xml | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/src/main/java/org/springblade/modules/retrieval/mapper/RetrievalMapper.xml b/src/main/java/org/springblade/modules/retrieval/mapper/RetrievalMapper.xml
index 83d9e0f..0acac46 100644
--- a/src/main/java/org/springblade/modules/retrieval/mapper/RetrievalMapper.xml
+++ b/src/main/java/org/springblade/modules/retrieval/mapper/RetrievalMapper.xml
@@ -66,6 +66,12 @@
<if test="retrieval.farmId != null and retrieval.farmId !=''">
AND (land.farm_id = #{retrieval.farmId} OR inv.fps_id = #{retrieval.farmId})
</if>
+ <if test="retrieval.type != null and retrieval.type !='' ">
+ AND retrieval.type = #{retrieval.type}
+ </if>
+ <if test="retrieval.kind != null and retrieval.kind !='' ">
+ AND (inv.product_id = #{retrieval.kind} OR retrieval.strain_id = #{retrieval.kind})
+ </if>
AND retrieval.is_deleted = 0 ORDER BY retrieval.create_time DESC
</select>
--
Gitblit v1.9.3