bug

epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcIndividualCategoryManageDao.xml

@@ -22,5 +22,6 @@
         INNER JOIN ic_resi_category_warn_config wc ON (sc.COLUMN_NAME = wc.COLUMN_NAME AND wc.DEL_FLAG = '0' AND wc.CUSTOMER_ID = sc.CUSTOMER_ID)
         WHERE cm.DEL_FLAG = 0
           AND cm.USER_ID = #{userId}
+        ORDER BY cm.sort
     </select>
 </mapper>

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

@@ -97,6 +97,7 @@
         count(*) as count
         from ic_resi_user
         where 1=1
+        AND status = '0'
         <if test="tableName=='ic_resi_user'">
             and ${columnName} = '1'
         </if>