moral.git - Gitblit

summary
reflog
commits
tree
tickets
docs
forks
compare

Merge remote-tracking branch 'origin/dev' into dev

lizijie

2021-08-31 b888331b6ba56caeeab12a4543fe81bac8854794

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

@@ -67,8 +67,7 @@
    <select id="selectOrgByMac" resultType="com.moral.api.entity.Organization">
        SELECT area_code, city_code
        FROM organization
        WHERE organization_id =
              (SELECT organization_id FROM special_device WHERE mac = #{mac})
        WHERE id = (SELECT organization_id FROM special_device WHERE mac = #{mac})
    </select>

</mapper>

			@@ -67,8 +67,7 @@
			<select id="selectOrgByMac" resultType="com.moral.api.entity.Organization">
			SELECT area_code, city_code
			FROM organization
			WHERE organization_id =
			(SELECT organization_id FROM special_device WHERE mac = #{mac})
			WHERE id = (SELECT organization_id FROM special_device WHERE mac = #{mac})
			</select>

			</mapper>