Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into 市北master

3 years ago · 3c553f6a9d
1 changed files with 3 additions and 0 deletions
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccineDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccineDao.xml
@ -61,6 +61,9 @@
            <if test='null != endTime and "" != endTime'>
                AND b.INOCULATE_TIME <![CDATA[ <= ]]> #{endTime}
            </if>
+            <if test='isResiUser != null and isResiUser != ""'>
+                AND b.IS_RESI_USER  = #{isResiUser}
+            </if>
        ORDER BY b.INOCULATE_TIME DESC, b.id ASC
    </select>