查询群名改为map类型

epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/group/controller/GroupController.java

@@ -202,9 +202,9 @@ public class GroupController {
      * @since 2019/11/12 9:30
      */
     @GetMapping("groupList")
-    @DataFilter(userId = FieldConstant.CREATED_BY)
+    @DataFilter(userId = FieldConstant.CREATED_BY, prefix = "AND")
-    public Result<List<GroupListDTO>> groupList(GroupDTO dto) {
+    public Result<List<GroupListDTO>> groupList(@RequestParam Map<String, Object> params) {
-        List<GroupListDTO> data = groupService.listOfGroupByGridId(dto);
+        List<GroupListDTO> data = groupService.listOfGroupByGridId(params);
         return new Result<List<GroupListDTO>>().ok(data);
     }
 

epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/group/dao/GroupDao.java

@@ -19,6 +19,7 @@ package com.elink.esua.epdc.modules.smile.group.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
 import com.elink.esua.epdc.dto.DeptLevelAndLeaderDTO;
+import com.elink.esua.epdc.modules.smile.group.entity.GroupEntity;
 import com.elink.esua.epdc.smile.dto.group.*;
 import com.elink.esua.epdc.smile.dto.group.form.GroupBySectionFormDTO;
 import com.elink.esua.epdc.smile.dto.group.form.GroupDetailForMobileEndFormDTO;
@@ -27,7 +28,6 @@ import com.elink.esua.epdc.smile.dto.group.result.GroupBySectionResultDTO;
 import com.elink.esua.epdc.smile.dto.group.result.GroupDetailForMobileEndResultDTO;
 import com.elink.esua.epdc.smile.dto.group.result.GroupsOfMineResultDTO;
 import com.elink.esua.epdc.smile.dto.group.result.GroupsOfRecommendResultDTO;
-import com.elink.esua.epdc.modules.smile.group.entity.GroupEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -141,7 +141,7 @@ public interface GroupDao extends BaseDao<GroupEntity> {
      * @author liuchuang
      * @since 2019/11/12 9:35
      */
-    List<GroupListDTO> selectListOfGroupByGridId(GroupDTO dto);
+    List<GroupListDTO> selectListOfGroupByGridId(Map<String, Object> params);
 
     /**
      * 获取警群社区下所有社群

epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/group/service/GroupService.java

@@ -266,7 +266,7 @@ public interface GroupService extends BaseService<GroupEntity> {
      * @author liuchuang
      * @since 2019/11/12 9:33
      */
-    List<GroupListDTO> listOfGroupByGridId(GroupDTO dto);
+    List<GroupListDTO> listOfGroupByGridId(Map<String, Object> params);
 
     /**
      * 排行榜-活跃度

epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/group/service/impl/GroupServiceImpl.java

@@ -418,8 +418,8 @@ public class GroupServiceImpl extends BaseServiceImpl<GroupDao, GroupEntity> imp
     }
 
     @Override
-    public List<GroupListDTO> listOfGroupByGridId(GroupDTO dto) {
+    public List<GroupListDTO> listOfGroupByGridId(Map<String, Object> params) {
-        return baseDao.selectListOfGroupByGridId(dto);
+        return baseDao.selectListOfGroupByGridId(params);
     }
 
     @Override