From 6b6725aac343f6decf4e475ff8b03f5b474e5759 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 18 Oct 2022 10:49:37 +0800
Subject: [PATCH] 拦截farm请求和user请求；用户详情接口增加preAuth注解
---
src/main/java/org/springblade/modules/farmplant/mapper/StrainMapper.xml | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/src/main/java/org/springblade/modules/farmplant/mapper/StrainMapper.xml b/src/main/java/org/springblade/modules/farmplant/mapper/StrainMapper.xml
index cad71a6..e3e1c0e 100644
--- a/src/main/java/org/springblade/modules/farmplant/mapper/StrainMapper.xml
+++ b/src/main/java/org/springblade/modules/farmplant/mapper/StrainMapper.xml
@@ -15,5 +15,13 @@
and strain_name like concat('%',#{strain.strainName},'%')
</if>
</select>
+ <select id="kindTree" resultType="java.util.Map">
+ SELECT strain.id,strain.strain_name kindName,0 AS type
+ FROM sys_strain strain
+ UNION
+ SELECT m.id ,m.machining_type,1 AS type
+ FROM sys_machining m
+ WHERE m.is_deleted = 0
+ </select>
</mapper>
--
Gitblit v1.9.3