diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/project/controller/PropertyProjectController.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/project/controller/PropertyProjectController.java
index 20a361c..f58c6e8 100644
--- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/project/controller/PropertyProjectController.java
+++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/project/controller/PropertyProjectController.java
@@ -17,6 +17,7 @@
 
 package com.elink.esua.epdc.modules.project.controller;
 
+import com.elink.esua.epdc.commons.mybatis.annotation.DataFilter;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
@@ -50,6 +51,7 @@ public class PropertyProjectController {
     private PropertyProjectService propertyProjectService;
 
     @GetMapping("page")
+    @DataFilter(tableAlias = "ep", deptId = "grid_id", prefix = "and",isPendingCreator = false)
     public Result<PageData<PropertyProjectDTO>> page(@RequestParam Map<String, Object> params) {
         PageData<PropertyProjectDTO> page = propertyProjectService.page(params);
         return new Result<PageData<PropertyProjectDTO>>().ok(page);
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 d138182..8c2fccd 100644
--- a/epdc-cloud-property/src/main/resources/mapper/project/PropertyProjectDao.xml
+++ b/epdc-cloud-property/src/main/resources/mapper/project/PropertyProjectDao.xml
@@ -24,11 +24,6 @@
         <result property="allDeptNames" column="ALL_DEPT_NAMES"/>
     </resultMap>
     <sql id="Base_Column_List">
-        <!--
-          WARNING - @mbg.generated
-          This element is automatically generated by MyBatis Generator, do not modify.
-          This element was generated on Tue Dec 10 11:23:20 CST 2019.
-        -->
         ID,	GRID_ID,	GRID,	PROJECT_NAME,	PROPERTY_NAME,	PROPERTY_TEL,	PROPERTY_MANAGER,	PROPERTY_ADDRESS,
         SORT,	REVISION,	DEL_FLAG,	CREATED_BY,	CREATED_TIME,	UPDATED_BY,	UPDATED_TIME,	PARENT_DEPT_IDS,
         PARENT_DEPT_NAMES,	ALL_DEPT_IDS,	ALL_DEPT_NAMES
@@ -37,18 +32,18 @@
         SELECT
         <include refid="Base_Column_List" />
         FROM
-        epdc_property_project
+        epdc_property_project ep
         WHERE
-        DEL_FLAG = '0'
+        ep.DEL_FLAG = '0'
         <if test="projectName != null and projectName != ''">
-            AND PROJECT_NAME like CONCAT( '%', #{projectName}, '%' )
+            AND ep.PROJECT_NAME like CONCAT( '%', #{projectName}, '%' )
         </if>
         <if test="gridId != null and gridId != ''">
-            AND (GRID_ID = #{gridId}
-            OR find_in_set(#{gridId},ALL_DEPT_IDS))
+            AND (ep.GRID_ID = #{gridId}
+            OR find_in_set(#{gridId},ep.ALL_DEPT_IDS))
         </if>
         ORDER BY
-        CREATED_TIME DESC
+        ep.CREATED_TIME DESC
     </select>
 
     <select id="listAll" resultType="com.elink.esua.epdc.modules.project.entity.PropertyProjectEntity">
@@ -75,21 +70,40 @@
         ep.PROPERTY_MANAGER,
         ep.PROPERTY_ADDRESS,
         eg.STATE AS GROUP_STATE,
+        eg.ID AS GROUP_ID,
         eg.GROUP_NAME,
         eg.GROUP_AVATAR,
-        COUNT(eg.ID) AS NUMBER_GROUP_MEMBER,
         SUM(
         CASE
-        WHEN eu.PARTY_MEMBER = '1' THEN
+        WHEN eu.ID IS NOT NULL THEN
         1
         ELSE
         0
         END
-        ) AS NUMBER_GROUP_PARTY_MEMBER
+        ) AS NUMBER_GROUP_MEMBER,
+        SUM(
+        CASE
+        WHEN eu.PARTY_MEMBER = #{userId} THEN
+        1
+        ELSE
+        0
+        END
+        ) AS NUMBER_GROUP_PARTY_MEMBER,
+        CASE
+        WHEN eu.USER_ID = #{userId}
+        AND eu.STATE = '0' THEN
+        1
+        WHEN eu.USER_ID = #{userId}
+        AND eu.STATE = '10' THEN
+        2
+        ELSE
+        0
+        END AS GROUP_MEMBER_FLAG
         FROM
         epdc_property_project ep
         LEFT JOIN epdc_group eg ON ep.id = eg.REFERENCE_BUSINESS_ID
-        LEFT JOIN epdc_user_group eu ON eg.id = eu.GROUP_ID AND eu.DEL_FLAG = '0'
+        LEFT JOIN epdc_user_group eu ON eg.id = eu.GROUP_ID
+        AND eu.DEL_FLAG = '0'
         WHERE
         ep.DEL_FLAG = '0'
         AND eg.DEL_FLAG = '0'