From c81ab633db51f31cc7c690a28e8fa8dfcdf34e2b Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Wed, 1 Jul 2020 15:37:21 +0800
Subject: [PATCH] =?UTF-8?q?group=5Fcategory=20=E5=AD=97=E6=AE=B5=E4=B8=8D?=
 =?UTF-8?q?=E5=86=8D=E4=BD=BF=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../group/controller/GroupController.java     |  1 +
 .../service/impl/PoliceServiceImpl.java       |  2 +-
 .../impl/PropertyProjectServiceImpl.java      |  2 +-
 .../main/resources/mapper/group/GroupDao.xml  | 88 +------------------
 4 files changed, 6 insertions(+), 87 deletions(-)

diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/group/controller/GroupController.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/group/controller/GroupController.java
index 41a92b1..c2485f4 100644
--- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/group/controller/GroupController.java
+++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/group/controller/GroupController.java
@@ -90,6 +90,7 @@ public class GroupController {
      * @since 2019/10/11 14:53
      */
     @GetMapping("interestpage")
+    @DataFilter(tableAlias = "gp", prefix = "AND", isPendingCreator = false)
     public Result<PageData<GroupManagementDTO>> interestPage(@RequestParam Map<String, Object> params) {
         PageData<GroupManagementDTO> page = groupService.interestPage(params);
         return new Result<PageData<GroupManagementDTO>>().ok(page);
diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/police/service/impl/PoliceServiceImpl.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/police/service/impl/PoliceServiceImpl.java
index 7755d0a..c6658be 100644
--- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/police/service/impl/PoliceServiceImpl.java
+++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/police/service/impl/PoliceServiceImpl.java
@@ -384,7 +384,7 @@ public class PoliceServiceImpl extends BaseServiceImpl<PoliceDao, PoliceEntity>
         groupEntity.setState(GroupStateEnum.GROUP_STATE_EXAMINATION_PASSED.getValue());
         groupEntity.setGroupAvatar(GroupConstant.PROPERTY_GROUP_AVATAR);
         groupEntity.setGroupName(gridName + "警民群");
-        groupEntity.setGroupCategory(GroupConstant.POLICE_GROUP_CATEGORY);
+//        groupEntity.setGroupCategory(GroupConstant.POLICE_GROUP_CATEGORY);
         groupEntity.setSectionCode(GroupConstant.POLICE_GROUP_SECTION);
         groupEntity.setCategoryCode(GroupConstant.POLICE_GROUP_CATEGORY_CODE);
         groupEntity.setTypeKey(GroupConstant.POLICE_GROUP_TYPE);
diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/project/service/impl/PropertyProjectServiceImpl.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/project/service/impl/PropertyProjectServiceImpl.java
index 9eebb0d..9c74795 100644
--- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/project/service/impl/PropertyProjectServiceImpl.java
+++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/project/service/impl/PropertyProjectServiceImpl.java
@@ -160,7 +160,7 @@ public class PropertyProjectServiceImpl extends BaseServiceImpl<PropertyProjectD
         groupEntity.setState(GroupStateEnum.GROUP_STATE_EXAMINATION_PASSED.getValue());
         groupEntity.setGroupAvatar(GroupConstant.PROPERTY_GROUP_AVATAR);
         groupEntity.setGroupName(entity.getProjectName() + "群");
-        groupEntity.setGroupCategory(GroupConstant.PROPERTY_GROUP_CATEGORY);
+//        groupEntity.setGroupCategory(GroupConstant.PROPERTY_GROUP_CATEGORY);
         groupEntity.setSectionCode(GroupConstant.PROPERTY_GROUP_SECTION);
         groupEntity.setCategoryCode(GroupConstant.PROPERTY_GROUP_CATEGORY_CODE);
         groupEntity.setTypeKey(GroupConstant.PROPERTY_GROUP_TYPE);
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 2c1f86f..1fce3a0 100644
--- a/epdc-cloud-property/src/main/resources/mapper/group/GroupDao.xml
+++ b/epdc-cloud-property/src/main/resources/mapper/group/GroupDao.xml
@@ -7,7 +7,6 @@
         SELECT
         gp.ID,
         gp.GROUP_NAME,
-        gp.GROUP_CATEGORY,
         gp.CREATED_TIME,
         gp.SECTION_CODE,
         gp.CATEGORY_CODE,
@@ -39,14 +38,13 @@
             OR find_in_set(#{communityId},gp.ALL_DEPT_IDS))
         </if>
         ORDER BY
-        gp.GROUP_CATEGORY, gp.CREATED_TIME DESC
+        gp.CATEGORY_CODE, gp.CREATED_TIME DESC
     </select>
 
     <select id="selectPoliceListOfGroups" resultType="com.elink.esua.epdc.dto.group.GroupManagementDTO">
         SELECT
         gp.ID,
         gp.GROUP_NAME,
-        gp.GROUP_CATEGORY,
         gp.CREATED_TIME,
         gp.SECTION_CODE,
         gp.CATEGORY_CODE,
@@ -82,14 +80,13 @@
             OR find_in_set(#{communityId},gp.ALL_DEPT_IDS))
         </if>
         ORDER BY
-        gp.GROUP_CATEGORY, gp.CREATED_TIME DESC
+        gp.CATEGORY_CODE, gp.CREATED_TIME DESC
     </select>
 
     <select id="selectInterestListOfGroups" resultType="com.elink.esua.epdc.dto.group.GroupManagementDTO">
         SELECT
         gp.ID,
         gp.GROUP_NAME,
-        gp.GROUP_CATEGORY,
         gp.CREATED_TIME,
         gp.SECTION_CODE,
         gp.CATEGORY_CODE,
@@ -127,14 +124,13 @@
             OR find_in_set(#{communityId},gp.ALL_DEPT_IDS))
         </if>
         ORDER BY
-        gp.GROUP_CATEGORY, gp.CREATED_TIME DESC
+        gp.CATEGORY_CODE, gp.CREATED_TIME DESC
     </select>
 
     <select id="selectInterestGroupByDept" resultType="com.elink.esua.epdc.dto.group.GroupManagementDTO">
         SELECT
         gp.ID,
         gp.GROUP_NAME,
-        gp.GROUP_CATEGORY,
         gp.CREATED_TIME,
         gp.STATE
         FROM
@@ -172,54 +168,6 @@
             AND gp.ID = #{id}
     </select>
 
-    <!--    <select id="selectListGroupsOfMine" resultType="com.elink.esua.epdc.dto.group.result.GroupsOfMineResultDTO">-->
-    <!--        SELECT-->
-    <!--            gp.ID,-->
-    <!--            gp.GROUP_NAME,-->
-    <!--            gp.GROUP_AVATAR,-->
-    <!--            gp.GROUP_CATEGORY,-->
-    <!--            gp.STATE,-->
-    <!--            COUNT( DISTINCT ugp1.ID ) AS totalNum,-->
-    <!--            COUNT(DISTINCT ugp2.ID) AS partyMemberNum,-->
-    <!--            COUNT( DISTINCT ugpr.ID ) AS unreadTopicNum,-->
-    <!--            MAX( tp.CREATED_TIME ) AS latestTopicTime,-->
-    <!--            CASE-->
-    <!--            WHEN gp.STATE = 0 THEN-->
-    <!--            '网格长会尽快审核您创建的社群，请耐心等待'-->
-    <!--            WHEN gp.STATE = 5 THEN-->
-    <!--            gp.PROCESSING_OPINIONS-->
-    <!--            WHEN ( gp.STATE = 10 AND COUNT( DISTINCT ugp1.ID ) <![CDATA[ <= ]]> 1 AND gp.GROUP_CATEGORY = '1' AND COUNT(DISTINCT tp.ID) = 0 ) THEN-->
-    <!--            '您的社群审核已通过，快加好友进来吧' ELSE ''-->
-    <!--            END AS description-->
-    <!--        FROM-->
-    <!--            epdc_group gp-->
-    <!--            RIGHT JOIN epdc_user_group ugp ON gp.ID = ugp.GROUP_ID-->
-    <!--            AND ugp.DEL_FLAG = '0'-->
-    <!--            AND ugp.USER_ID = #{userId}-->
-    <!--            AND ugp.STATE = 10-->
-    <!--            LEFT JOIN epdc_user_group ugp1 ON gp.ID = ugp1.GROUP_ID-->
-    <!--            AND ugp1.DEL_FLAG = '0'-->
-    <!--            AND ugp1.STATE = 10-->
-    <!--            LEFT JOIN epdc_user_group ugp2 ON gp.ID = ugp2.GROUP_ID-->
-    <!--            AND ugp2.DEL_FLAG = '0'-->
-    <!--            AND ugp2.STATE = 10-->
-    <!--			AND ugp2.PARTY_MEMBER = '1'-->
-    <!--            LEFT JOIN epdc_group_topic_user_read ugpr ON gp.ID = ugpr.GROUP_ID-->
-    <!--            AND ugpr.DEL_FLAG = '0'-->
-    <!--            AND ugpr.USER_ID = #{userId}-->
-    <!--            AND ugpr.READ_FLAG = '0'-->
-    <!--            LEFT JOIN epdc_topic tp ON gp.ID = tp.GROUP_ID-->
-    <!--			AND tp.DEL_FLAG = '0'-->
-    <!--        WHERE-->
-    <!--            gp.DEL_FLAG = '0'-->
-    <!--            AND gp.DEPT_ID = #{gridId}-->
-    <!--            <![CDATA[ AND gp.STATE <> ]]> 20-->
-    <!--        GROUP BY-->
-    <!--            gp.ID-->
-    <!--        ORDER BY-->
-    <!--            MAX( tp.CREATED_TIME ) DESC-->
-    <!--    </select>-->
-
     <select id="selectListGroupsOfMine" resultType="com.elink.esua.epdc.dto.group.result.GroupsOfMineResultDTO">
         SELECT
 	t.ID,
@@ -291,36 +239,6 @@ ORDER BY
 	latestTopicTime DESC
     </select>
 
-    <!--    <select id="selectListGroupsOfRecommend" resultType="com.elink.esua.epdc.dto.group.result.GroupsOfRecommendResultDTO">-->
-    <!--        SELECT-->
-    <!--            gp.ID,-->
-    <!--            gp.GROUP_NAME,-->
-    <!--            gp.GROUP_AVATAR,-->
-    <!--            COUNT( DISTINCT ugp1.ID ) AS totalNum,-->
-    <!--            COUNT( DISTINCT ugp2.ID ) AS partyMemberNum-->
-    <!--        FROM-->
-    <!--            epdc_group gp-->
-    <!--            LEFT JOIN epdc_user_group ugp1 ON gp.ID = ugp1.GROUP_ID-->
-    <!--            AND ugp1.DEL_FLAG = '0'-->
-    <!--            AND ugp1.STATE = 10-->
-    <!--            LEFT JOIN epdc_user_group ugp2 ON gp.ID = ugp2.GROUP_ID-->
-    <!--            AND ugp2.DEL_FLAG = '0'-->
-    <!--            AND ugp2.STATE = 10-->
-    <!--			AND ugp2.PARTY_MEMBER = '1'-->
-    <!--            LEFT JOIN epdc_topic tp ON gp.ID = tp.GROUP_ID-->
-    <!--			AND tp.DEL_FLAG = '0'-->
-    <!--        WHERE-->
-    <!--            gp.DEL_FLAG = '0'-->
-    <!--            AND gp.STATE IN ( 10, 15 )-->
-    <!--            AND gp.DEPT_ID = #{gridId}-->
-    <!--            AND gp.GROUP_CATEGORY = '1'-->
-    <!--            AND gp.ID NOT IN ( SELECT ugp.GROUP_ID FROM epdc_user_group ugp WHERE ugp.USER_ID = #{userId} AND ugp.DEL_FLAG = '0' AND ugp.STATE = 10 )-->
-    <!--        GROUP BY-->
-    <!--            gp.ID-->
-    <!--        ORDER BY-->
-    <!--            MAX( tp.CREATED_TIME ) DESC-->
-    <!--    </select>-->
-
     <select id="selectListGroupsOfRecommend"
             resultType="com.elink.esua.epdc.dto.group.result.GroupsOfRecommendResultDTO">
         SELECT