模块不绑定设备，设备绑定模块。

guoshilong

2023-03-22 a99354841669e8d4c4ef76428348b1a5ef1db065

 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 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>