From ac2b4ef91a2dc4ad452f8fadf2e9fc0bcb23ac7d Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 23 Mar 2023 11:53:10 +0800
Subject: [PATCH] 修复问题
---
src/main/java/org/springblade/modules/modules/mapper/FunctionMapper.xml | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/springblade/modules/modules/mapper/FunctionMapper.xml b/src/main/java/org/springblade/modules/modules/mapper/FunctionMapper.xml
index 89e3153..95936c2 100644
--- a/src/main/java/org/springblade/modules/modules/mapper/FunctionMapper.xml
+++ b/src/main/java/org/springblade/modules/modules/mapper/FunctionMapper.xml
@@ -3,7 +3,7 @@
<mapper namespace="org.springblade.modules.modules.mapper.FunctionMapper">
<!-- 通用查询映射结果 -->
- <resultMap id="modulesFunctionResultMap" type="org.springblade.modules.modules.entity.FunctionEntity">
+ <resultMap id="modulesFunctionResultMap" type="org.springblade.modules.modules.vo.FunctionVO">
<result column="id" property="id"/>
<result column="modules_id" property="modulesId"/>
<result column="name" property="name"/>
@@ -11,6 +11,7 @@
<result column="type" property="type"/>
<result column="sort" property="sort"/>
<result column="file_url" property="fileUrl" typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/>
+ <result column="code" property="equipmentCode"/>
<result column="tenant_id" property="tenantId"/>
<result column="create_user" property="createUser"/>
<result column="create_dept" property="createDept"/>
@@ -27,12 +28,18 @@
</select>
<select id="getAll" resultMap="modulesFunctionResultMap">
- select * from sys_modules_function
- where is_deleted = 0
+ select func.*,equipment.code
+ from sys_modules_function func
+ LEFT JOIN sys_modules modules ON modules.id = func.modules_id AND modules.is_deleted = 0
+ LEFT JOIN sys_equipment equipment ON equipment.modules_id = modules.id
+ where func.is_deleted = 0
<if test="function.modulesId !=null and function.modulesId !=''">
- AND modules_id = #{function.modulesId}
+ AND func.modules_id = #{function.modulesId}
</if>
- ORDER BY property ASC,sort ASC
+ <if test="function.equipmentCode !=null and function.equipmentCode !=''">
+ AND equipment.code = #{function.equipmentCode}
+ </if>
+ ORDER BY func.property ASC,func.sort ASC
</select>
--
Gitblit v1.9.3