From 9bbe2a350e6a56e0558f1e21f3d687e5ae4d610e Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Wed, 26 Jan 2022 13:33:37 +0800
Subject: [PATCH] bug

---
 .../src/main/resources/mapper/IcIndividualCategoryManageDao.xml  | 1 +
 .../src/main/resources/mapper/IcStatsResiWarnDao.xml             | 1 +
 2 files changed, 2 insertions(+)

diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcIndividualCategoryManageDao.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcIndividualCategoryManageDao.xml
index 8979fb442c..47df855e0a 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcIndividualCategoryManageDao.xml
+++ b/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>
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcStatsResiWarnDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcStatsResiWarnDao.xml
index 608d10d5cd..572f9d8577 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcStatsResiWarnDao.xml
+++ b/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>