moral.git - Gitblit

summary
reflog
commits
tree
tickets
docs
forks
compare

jinpengyong

2023-11-14 b5b6b59de8f5349de1e36875582224f2712e0727

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

@@ -199,7 +199,7 @@
        <if test="organizationId !=null">
            AND organization_id = #{organizationId}
        </if>
           and mac LIKE "%"#{mac}"%" AND is_delete = 0
           and mac LIKE "%"#{mac}"%" or `name` like "%"#{mac}"%" AND is_delete = 0
        union
        SELECT sd.id,sd.`name`,sd.mac,sd.special_type FROM special_device  as sd
        WHERE 1=1

			@@ -199,7 +199,7 @@
			<if test="organizationId !=null">
			AND organization_id = #{organizationId}
			</if>
			and mac LIKE "%"#{mac}"%" AND is_delete = 0
			and mac LIKE "%"#{mac}"%" or `name` like "%"#{mac}"%" AND is_delete = 0
			union
			SELECT sd.id,sd.`name`,sd.mac,sd.special_type FROM special_device as sd
			WHERE 1=1