moral.git - Gitblit

summary
reflog
commits
tree
tickets
docs
forks
compare

Merge remote-tracking branch 'origin/cjl' into qa

cjl

2023-12-14 6992aaf0587c09f7c511c1afd12e1519d91363d3

 screen-api/src/main/resources/mapper/SpecialDeviceMapper.xml

@@ -17,4 +17,13 @@
        <result column="is_delete" property="isDelete"/>
    </resultMap>

    <select id="selectSpecialDevice" resultType="com.moral.api.pojo.vo.device.AppDeviceVo">
        SELECT id,`name`,mac,special_type FROM special_device
        WHERE 1=1
        <if test="organization_id !=null">
            AND organization_id=#{organizationId}
        </if>
           AND is_delete =0
    </select>

</mapper>

			@@ -17,4 +17,13 @@
			<result column="is_delete" property="isDelete"/>
			</resultMap>

			<select id="selectSpecialDevice" resultType="com.moral.api.pojo.vo.device.AppDeviceVo">
			SELECT id,`name`,mac,special_type FROM special_device
			WHERE 1=1
			<if test="organization_id !=null">
			AND organization_id=#{organizationId}
			</if>
			AND is_delete =0
			</select>

			</mapper>