From 2ac80d588a68f60084d8bcc02aabd18c91100267 Mon Sep 17 00:00:00 2001 From: fengxiang <110431245@qq.com> Date: Tue, 29 May 2018 14:50:37 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/main/resources/mapper/SensorMapper.xml | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/main/resources/mapper/SensorMapper.xml b/src/main/resources/mapper/SensorMapper.xml index 00e3a23..88cb11d 100644 --- a/src/main/resources/mapper/SensorMapper.xml +++ b/src/main/resources/mapper/SensorMapper.xml @@ -62,6 +62,9 @@ <if test="mac != null"> AND d.mac = #{mac} </if> + <if test="professionId != null"> + AND d.profession_id = #{professionId} + </if> </select> </mapper> \ No newline at end of file -- Gitblit v1.8.0