diff --git a/epdc-cloud-property/src/main/resources/mapper/group/GroupDao.xml b/epdc-cloud-property/src/main/resources/mapper/group/GroupDao.xml
index 69c9a65..bbb8b8c 100644
--- a/epdc-cloud-property/src/main/resources/mapper/group/GroupDao.xml
+++ b/epdc-cloud-property/src/main/resources/mapper/group/GroupDao.xml
@@ -388,7 +388,9 @@ ORDER BY
             epdc_group
         WHERE
             DEL_FLAG = '0'
-            AND GROUP_CATEGORY = '3'
+            AND SECTION_CODE = 'theme_group'
+            AND CATEGORY_CODE = 'police_group'
+            AND TYPE_KEY = 'grid_party'
             AND STATE IN ( 10, 15, 20 )
             AND DEPT_ID = #{deptId}
     </select>
@@ -401,7 +403,9 @@ ORDER BY
         epdc_group
         WHERE
         DEL_FLAG = '0'
-        AND GROUP_CATEGORY = '3'
+        AND SECTION_CODE = 'theme_group'
+        AND CATEGORY_CODE = 'police_group'
+        AND TYPE_KEY = 'grid_party'
         AND STATE IN ( 10, 15 )
         AND PARENT_DEPT_IDS LIKE CONCAT( '%', #{deptId} )
     </select>
diff --git a/epdc-cloud-property/src/main/resources/mapper/police/PoliceDao.xml b/epdc-cloud-property/src/main/resources/mapper/police/PoliceDao.xml
index 059debf..77392a8 100644
--- a/epdc-cloud-property/src/main/resources/mapper/police/PoliceDao.xml
+++ b/epdc-cloud-property/src/main/resources/mapper/police/PoliceDao.xml
@@ -62,7 +62,9 @@
             LEFT JOIN epdc_user_group eu ON eg.id = eu.GROUP_ID AND eu.DEL_FLAG = '0'
         WHERE
             eg.DEL_FLAG = '0'
-            AND eg.GROUP_CATEGORY = '3'
+            AND eg.SECTION_CODE = 'theme_group'
+            AND eg.CATEGORY_CODE = 'police_group'
+            AND eg.TYPE_KEY = 'grid_party'
             AND ( eg.STATE = '10' OR eg.STATE = '15' )
             <if test="gridId != null and gridId != ''">
                 AND (eg.DEPT_ID = #{gridId}
@@ -111,6 +113,8 @@
             epdc_group
         WHERE
             FIND_IN_SET( #{deptId}, ALL_DEPT_IDS )
-            AND GROUP_CATEGORY = '3'
+            AND SECTION_CODE = 'theme_group'
+            AND CATEGORY_CODE = 'police_group'
+            AND TYPE_KEY = 'grid_party'
     </select>
 </mapper>
\ No newline at end of file
diff --git a/epdc-cloud-property/src/main/resources/mapper/project/PropertyProjectDao.xml b/epdc-cloud-property/src/main/resources/mapper/project/PropertyProjectDao.xml
index 38edbdf..2a8325f 100644
--- a/epdc-cloud-property/src/main/resources/mapper/project/PropertyProjectDao.xml
+++ b/epdc-cloud-property/src/main/resources/mapper/project/PropertyProjectDao.xml
@@ -204,7 +204,9 @@
             epdc_group
         WHERE
             FIND_IN_SET( #{deptId}, ALL_DEPT_IDS )
-            AND GROUP_CATEGORY = '2'
+            AND SECTION_CODE = 'theme_group'
+            AND CATEGORY_CODE = 'property_group'
+            AND TYPE_KEY = 'grid_party'
     </select>
 
 </mapper>
\ No newline at end of file