Merge remote-tracking branch 'origin/master'

hiatmp-hidden-danger-server/src/main/resources/sql-mapper/HighDangerMapper.xml

@@ -81,7 +81,7 @@
         1 = 1
         AND hdb.status = '10'
         AND hdr.nid is not null
-        AND hdb.approve_status in ('0','-1',null)
+        AND COALESCE(hdb.approve_status,'0')IN('0','-1')
         <if test="cdepartmentid != null">
             AND hdr.belong_xq like concat(concat(#{cdepartmentid}::text,'%'))
         </if>