Merge branch 'develop' of http://121.42.41.42:7070/r/epmet-cloud into develop

epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml

@@ -75,7 +75,6 @@
                     </if>
 
                     <if test="subCondition.queryType!= null and subCondition.queryType == 'notnull' ">
-                            and ic_resi_user.customer_id='45687aa479955f9d06204d415238f7cc'
                         <if test="null!=subCondition.columnValue[0] and subCondition.columnValue[0] =='1'.toString()">
                             and ${subCondition.tableName}.${subCondition.columnName} is not null
                             and ${subCondition.tableName}.${subCondition.columnName} !=''
@@ -113,6 +112,17 @@
                     <if test="subCondition.queryType!= null and subCondition.queryType == 'daterange' ">
                         and ${subCondition.tableName}.${subCondition.columnName} between #{subCondition.columnValue[0]} and #{subCondition.columnValue[1]}
                     </if>
+
+                    <if test="subCondition.queryType!= null and subCondition.queryType == 'notnull' ">
+                        <if test="null!=subCondition.columnValue[0] and subCondition.columnValue[0] =='1'.toString()">
+                            and ${subCondition.tableName}.${subCondition.columnName} is not null
+                            and ${subCondition.tableName}.${subCondition.columnName} !=''
+                        </if>
+                        <if test="null!=subCondition.columnValue[0] and subCondition.columnValue[0] =='0'.toString()">
+                            and (${subCondition.tableName}.${subCondition.columnName} is null
+                            or ${subCondition.tableName}.${subCondition.columnName} ='')
+                        </if>
+                    </if>
                 </if>
             </foreach>
         </if>