Merge remote-tracking branch 'origin/origin/grid_member'

epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/GridMemberCategoryController.java

@@ -0,0 +1,118 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.controller;
+
+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;
+import com.elink.esua.epdc.commons.tools.validator.AssertUtils;
+import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
+import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
+import com.elink.esua.epdc.dto.GridMemberCategoryDTO;
+import com.elink.esua.epdc.excel.GridMemberCategoryExcel;
+import com.elink.esua.epdc.service.GridMemberCategoryService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 网格队伍分类
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2021-11-04
+ */
+@RestController
+@RequestMapping("gridmembercategory")
+public class GridMemberCategoryController {
+    
+    @Autowired
+    private GridMemberCategoryService gridMemberCategoryService;
+
+    @GetMapping("page")
+    public Result<PageData<GridMemberCategoryDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<GridMemberCategoryDTO> page = gridMemberCategoryService.page(params);
+        return new Result<PageData<GridMemberCategoryDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    public Result<GridMemberCategoryDTO> get(@PathVariable("id") String id){
+        GridMemberCategoryDTO data = gridMemberCategoryService.get(id);
+        return new Result<GridMemberCategoryDTO>().ok(data);
+    }
+
+    @PostMapping
+    public Result save(@RequestBody GridMemberCategoryDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        gridMemberCategoryService.save(dto);
+        return new Result();
+    }
+
+    @PutMapping
+    public Result update(@RequestBody GridMemberCategoryDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        gridMemberCategoryService.update(dto);
+        return new Result();
+    }
+
+    @DeleteMapping
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        gridMemberCategoryService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<GridMemberCategoryDTO> list = gridMemberCategoryService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, GridMemberCategoryExcel.class);
+    }
+
+    /**
+    * @describe: 获取网格队伍分类
+    * @author wangtong
+    * @date 2021/11/4 15:38
+    * @params []
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    */
+    @GetMapping("getGridCategoryList")
+    public Result getGridCategoryList() {
+        return gridMemberCategoryService.getGridCategoryList();
+    }
+
+    /**
+     * @describe: 获取社区列表
+     * @author wangtong
+     * @date 2021/11/5 10:24
+     * @params []
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     */
+    @GetMapping("getCommunityDeptList")
+    public Result getCommunityDeptList() {
+        return gridMemberCategoryService.getCommunityDeptList();
+    }
+
+}

epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/GridMemberCategoryDao.java

@@ -0,0 +1,53 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.dao;
+
+import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.entity.GridMemberCategoryEntity;
+import com.elink.esua.epdc.entity.SysDeptEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 网格队伍分类
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2021-11-04
+ */
+@Mapper
+public interface GridMemberCategoryDao extends BaseDao<GridMemberCategoryEntity> {
+
+    /**
+     * @describe: 获取网格队伍分类
+     * @author wangtong
+     * @date 2021/11/4 15:38
+     * @params []
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     */
+    List<GridMemberCategoryEntity> getGridCategoryList();
+
+    /**
+     * @describe: 获取社区列表
+     * @author wangtong
+     * @date 2021/11/5 10:24
+     * @params []
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     */
+    List<SysDeptEntity> getCommunityDeptList();
+}

epdc-cloud-admin/src/main/java/com/elink/esua/epdc/entity/GridMemberCategoryEntity.java

@@ -0,0 +1,87 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.elink.esua.epdc.commons.mybatis.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 网格队伍分类
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2021-11-04
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("epdc_grid_member_category")
+public class GridMemberCategoryEntity extends BaseEntity {
+
+	private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 类别名称
+     */
+	private String typeName;
+
+    /**
+     * 类别编码
+     */
+	private String typeCode;
+
+    /**
+     * 排序
+     */
+	private Integer sort;
+
+    /**
+     * 图片地址
+     */
+	private String imgUrl;
+
+    /**
+     * 启用标识 0-启用，1-未启用
+     */
+	private String bannerFlag;
+
+    /**
+     * 删除标识  0：未删除    1：删除
+     */
+	@TableField(fill = FieldFill.INSERT)
+	private Integer delFlag;
+
+
+    /**
+     * 更新者
+     */
+	@TableField(fill = FieldFill.INSERT_UPDATE)
+	private Long updater;
+
+    /**
+     * 更新时间
+     */
+	@TableField(fill = FieldFill.INSERT_UPDATE)
+	private Date updateDate;
+
+}

epdc-cloud-admin/src/main/java/com/elink/esua/epdc/entity/GridMemberEntity.java

@@ -18,13 +18,10 @@
 package com.elink.esua.epdc.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 网格员信息
  *
@@ -73,6 +70,11 @@ public class GridMemberEntity extends BaseEpdcEntity {
      */
 	private String mobile;
 
+	/**
+	 * 类别编码
+	 */
+	private String categoryCode;
+
     /**
      * 所属网格名称
      */

epdc-cloud-admin/src/main/java/com/elink/esua/epdc/excel/GridMemberCategoryExcel.java

@@ -0,0 +1,68 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 网格队伍分类
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2021-11-04
+ */
+@Data
+public class GridMemberCategoryExcel {
+
+    @Excel(name = "标识号")
+    private Long id;
+
+    @Excel(name = "类别名称")
+    private String typeName;
+
+    @Excel(name = "类别编码")
+    private String typeCode;
+
+    @Excel(name = "排序")
+    private Integer sort;
+
+    @Excel(name = "图片地址")
+    private String imgUrl;
+
+    @Excel(name = "启用标识 0-启用，1-未启用")
+    private String bannerFlag;
+
+    @Excel(name = "删除标识  0：未删除    1：删除")
+    private Integer delFlag;
+
+    @Excel(name = "创建者")
+    private Long creator;
+
+    @Excel(name = "创建时间")
+    private Date createDate;
+
+    @Excel(name = "更新者")
+    private Long updater;
+
+    @Excel(name = "更新时间")
+    private Date updateDate;
+
+
+}

epdc-cloud-admin/src/main/java/com/elink/esua/epdc/redis/GridMemberCategoryRedis.java

@@ -0,0 +1,47 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.redis;
+
+import com.elink.esua.epdc.commons.tools.redis.RedisUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 网格队伍分类
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2021-11-04
+ */
+@Component
+public class GridMemberCategoryRedis {
+    @Autowired
+    private RedisUtils redisUtils;
+
+    public void delete(Object[] ids) {
+
+    }
+
+    public void set(){
+
+    }
+
+    public String get(String id){
+        return null;
+    }
+
+}

epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/GridMemberCategoryService.java

@@ -0,0 +1,114 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.service;
+
+import com.elink.esua.epdc.commons.mybatis.service.BaseService;
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.GridMemberCategoryDTO;
+import com.elink.esua.epdc.entity.GridMemberCategoryEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 网格队伍分类
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2021-11-04
+ */
+public interface GridMemberCategoryService extends BaseService<GridMemberCategoryEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<GridMemberCategoryDTO>
+     * @author generator
+     * @date 2021-11-04
+     */
+    PageData<GridMemberCategoryDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<GridMemberCategoryDTO>
+     * @author generator
+     * @date 2021-11-04
+     */
+    List<GridMemberCategoryDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return GridMemberCategoryDTO
+     * @author generator
+     * @date 2021-11-04
+     */
+    GridMemberCategoryDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-11-04
+     */
+    void save(GridMemberCategoryDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-11-04
+     */
+    void update(GridMemberCategoryDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2021-11-04
+     */
+    void delete(String[] ids);
+
+    /**
+     * @describe: 获取网格队伍分类
+     * @author wangtong
+     * @date 2021/11/4 15:38
+     * @params []
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     */
+    Result getGridCategoryList();
+
+    /**
+     * @describe: 获取社区列表
+     * @author wangtong
+     * @date 2021/11/5 10:24
+     * @params []
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     */
+    Result getCommunityDeptList();
+}

epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/GridMemberCategoryServiceImpl.java

@@ -0,0 +1,143 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
+import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
+import com.elink.esua.epdc.commons.tools.exception.RenException;
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dao.GridMemberCategoryDao;
+import com.elink.esua.epdc.dto.GridMemberCategoryDTO;
+import com.elink.esua.epdc.entity.GridMemberCategoryEntity;
+import com.elink.esua.epdc.entity.SysDeptEntity;
+import com.elink.esua.epdc.redis.GridMemberCategoryRedis;
+import com.elink.esua.epdc.service.GridMemberCategoryService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 网格队伍分类
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2021-11-04
+ */
+@Service
+public class GridMemberCategoryServiceImpl extends BaseServiceImpl<GridMemberCategoryDao, GridMemberCategoryEntity> implements GridMemberCategoryService {
+
+    @Autowired
+    private GridMemberCategoryRedis gridMemberCategoryRedis;
+
+    @Override
+    public PageData<GridMemberCategoryDTO> page(Map<String, Object> params) {
+        IPage<GridMemberCategoryEntity> page = baseDao.selectPage(
+                getPage(params, "sort", true),
+                getWrapper(params)
+        );
+        return getPageData(page, GridMemberCategoryDTO.class);
+    }
+
+    @Override
+    public List<GridMemberCategoryDTO> list(Map<String, Object> params) {
+        List<GridMemberCategoryEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, GridMemberCategoryDTO.class);
+    }
+
+    private QueryWrapper<GridMemberCategoryEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<GridMemberCategoryEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public GridMemberCategoryDTO get(String id) {
+        GridMemberCategoryEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, GridMemberCategoryDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(GridMemberCategoryDTO dto) {
+        String categoryCode = dto.getTypeCode();
+        if (StringUtils.isNotBlank(categoryCode)) {
+            if (getCodeCount(dto) > 0) {
+                throw new RenException("您输入的编码已存在");
+            }
+        }
+        GridMemberCategoryEntity entity = ConvertUtils.sourceToTarget(dto, GridMemberCategoryEntity.class);
+        insert(entity);
+    }
+
+    public Integer getCodeCount(GridMemberCategoryDTO dto) {
+        QueryWrapper<GridMemberCategoryEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq("type_code", dto.getTypeCode());
+        wrapper.eq("del_flag", "0");
+        return baseDao.selectCount(wrapper);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(GridMemberCategoryDTO dto) {
+
+        String categoryCode = dto.getTypeCode();
+        QueryWrapper<GridMemberCategoryEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq("type_code", dto.getTypeCode());
+        wrapper.eq("del_flag", "0");
+        wrapper.ne("id", dto.getId());
+        if (StringUtils.isNotBlank(categoryCode)) {
+            if (baseDao.selectCount(wrapper) > 0) {
+                throw new RenException("您输入的编码已存在");
+            }
+        }
+        GridMemberCategoryEntity entity = ConvertUtils.sourceToTarget(dto, GridMemberCategoryEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+    @Override
+    public Result getGridCategoryList() {
+        List<GridMemberCategoryEntity> result = baseDao.getGridCategoryList();
+        return new Result().ok(result);
+    }
+
+    @Override
+    public Result getCommunityDeptList() {
+        List<SysDeptEntity> result = baseDao.getCommunityDeptList();
+        return new Result().ok(result);
+    }
+
+}

epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/GridMemberServiceImpl.java

@@ -34,6 +34,7 @@ import com.elink.esua.epdc.entity.SysDeptEntity;
 import com.elink.esua.epdc.optimize.modules.deptlevel.service.OptSysDeptService;
 import com.elink.esua.epdc.redis.GridMemberRedis;
 import com.elink.esua.epdc.service.GridMemberService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -50,6 +51,7 @@ import java.util.Map;
  * @since v1.0.0 2021-09-14
  */
 @Service
+@Slf4j
 public class GridMemberServiceImpl extends BaseServiceImpl<GridMemberDao, GridMemberEntity> implements GridMemberService {
 
     @Autowired
@@ -140,8 +142,9 @@ public class GridMemberServiceImpl extends BaseServiceImpl<GridMemberDao, GridMe
 
     @Override
     public Result getMemberList(AppMemberListFromDTO dto) {
-        SysDeptEntity entity = sysDeptDao.selectById(dto.getDeptId());
-        dto.setDeptId(entity.getPid());
+//        SysDeptEntity entity = sysDeptDao.selectById(dto.getDeptId());
+//        dto.setDeptId(entity.getPid());
+        log.info("getMemberList-dto:"+dto);
         int pageIndex = (dto.getPageIndex() - NumConstant.ONE) * dto.getPageSize();
         dto.setPageIndex(pageIndex);
         List<AppMemberListResultDTO> result = baseDao.getMemberList(dto);

epdc-cloud-admin/src/main/resources/mapper/GridMemberCategoryDao.xml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.elink.esua.epdc.dao.GridMemberCategoryDao">
+
+    <resultMap type="com.elink.esua.epdc.entity.GridMemberCategoryEntity" id="gridMemberCategoryMap">
+        <result property="id" column="id"/>
+        <result property="typeName" column="type_name"/>
+        <result property="typeCode" column="type_code"/>
+        <result property="sort" column="sort"/>
+        <result property="imgUrl" column="img_url"/>
+        <result property="bannerFlag" column="banner_flag"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="creator" column="creator"/>
+        <result property="createDate" column="create_date"/>
+        <result property="updater" column="updater"/>
+        <result property="updateDate" column="update_date"/>
+    </resultMap>
+    <select id="getGridCategoryList" resultType="com.elink.esua.epdc.entity.GridMemberCategoryEntity">
+        select * from epdc_grid_member_category
+        where del_flag='0'
+                    and banner_flag='0'
+                    order by sort asc
+    </select>
+    <select id="getCommunityDeptList" resultType="com.elink.esua.epdc.entity.SysDeptEntity">
+        select * from sys_dept
+        where del_flag='0'
+                    and type_key='community_party'
+                    and id not in (select dept_id from sys_dept_config where del_flag='0')
+        order by sort asc
+    </select>
+
+
+</mapper>

epdc-cloud-admin/src/main/resources/mapper/GridMemberDao.xml

@@ -52,6 +52,7 @@
         from epdc_grid_member
         where del_flag='0'
 			and FIND_IN_SET(#{deptId},ALL_DEPT_IDS)
+			and CATEGORY_CODE=#{categoryCode}
 		order by CREATED_TIME desc
 		LIMIT #{pageIndex},#{pageSize}
     </select>