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/process/mapper/ProcessMapper.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/process/mapper/ProcessMapper.xml b/src/main/java/org/springblade/modules/process/mapper/ProcessMapper.xml
index abbab9e..3090eb0 100644
--- a/src/main/java/org/springblade/modules/process/mapper/ProcessMapper.xml
+++ b/src/main/java/org/springblade/modules/process/mapper/ProcessMapper.xml
@@ -44,8 +44,8 @@
<if test="process.farmId!=null and process.farmId!=''">
AND (sl.farm_id = #{process.farmId} or (inv.fps_id = #{process.farmId} AND p.land_id IS NULL))
</if>
- <if test="process.strainId !=null and process.strainId !=''">
- and p.strain_id = #{process.strainId}
+ <if test="process.kind !=null and process.kind !=''">
+ and (p.strain_id = #{process.kind} OR p.parent_id = #{process.kind})
</if>
GROUP BY p.id
ORDER BY p.create_time DESC
--
Gitblit v1.9.3