Merge remote-tracking branch 'origin/feature/phaseOne' into feature/phaseOne

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

@@ -0,0 +1,119 @@
+/**
+ * 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.DefaultGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
+import com.elink.esua.epdc.dto.AppMemberListFromDTO;
+import com.elink.esua.epdc.dto.GridMemberDTO;
+import com.elink.esua.epdc.excel.GridMemberExcel;
+import com.elink.esua.epdc.service.GridMemberService;
+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-09-14
+ */
+@RestController
+@RequestMapping("gridmember")
+public class GridMemberController {
+    
+    @Autowired
+    private GridMemberService gridMemberService;
+
+    @GetMapping("page")
+    public Result<PageData<GridMemberDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<GridMemberDTO> page = gridMemberService.page(params);
+        return new Result<PageData<GridMemberDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    public Result<GridMemberDTO> get(@PathVariable("id") String id){
+        GridMemberDTO data = gridMemberService.get(id);
+        return new Result<GridMemberDTO>().ok(data);
+    }
+
+    @PostMapping
+    public Result save(@RequestBody GridMemberDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        gridMemberService.save(dto);
+        return new Result();
+    }
+
+    @PutMapping
+    public Result update(@RequestBody GridMemberDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        gridMemberService.update(dto);
+        return new Result();
+    }
+
+    @DeleteMapping
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        gridMemberService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<GridMemberDTO> list = gridMemberService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, GridMemberExcel.class);
+    }
+
+    /**
+    * @describe: 居民端-网格队伍-社区介绍
+    * @author wangtong
+    * @date 2021/9/14 16:25
+    * @params [userDetail]
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    */
+    @GetMapping("getDeptInfo")
+    public Result getDeptInfo(@RequestBody AppMemberListFromDTO dto){
+        return gridMemberService.getDeptInfo(dto);
+    }
+
+    /**
+    * @describe: 居民端-网格队伍-网格员列表
+    * @author wangtong
+    * @date 2021/9/14 16:29
+    * @params [AppMemberListFromDTO]
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    */
+    @GetMapping("getMemberList")
+    public Result getMemberList(@RequestBody AppMemberListFromDTO dto){
+        return gridMemberService.getMemberList(dto);
+    }
+
+}

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

@@ -0,0 +1,49 @@
+/**
+ * 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.dto.AppMemberListFromDTO;
+import com.elink.esua.epdc.dto.AppMemberListResultDTO;
+import com.elink.esua.epdc.dto.GridMemberDTO;
+import com.elink.esua.epdc.entity.GridMemberEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 网格员信息
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2021-09-14
+ */
+@Mapper
+public interface GridMemberDao extends BaseDao<GridMemberEntity> {
+
+    List<GridMemberDTO> getPageList(Map<String, Object> params);
+
+    /**
+    * @describe:  居民端-网格队伍-网格员列表
+    * @author wangtong
+    * @date 2021/9/14 16:52
+    * @params [communityId]
+    * @return com.elink.esua.epdc.dto.AppMemberListResultDTO
+    */
+    List<AppMemberListResultDTO> getMemberList(AppMemberListFromDTO dto);
+}

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

@@ -18,8 +18,10 @@
 package com.elink.esua.epdc.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.dto.AppDeptInfoResultDTO;
 import com.elink.esua.epdc.entity.SysDeptInfoEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 部门信息表 组织信息表
@@ -30,4 +32,12 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface SysDeptInfoDao extends BaseDao<SysDeptInfoEntity> {
 
+    /**
+    * @describe: 通过部门id查询
+    * @author wangtong
+    * @date 2021/9/14 16:41
+    * @params [id]
+    * @return com.elink.esua.epdc.dto.AppDeptInfoResultDTO
+    */
+    AppDeptInfoResultDTO selectByDeptId(@Param("deptId") Long deptId);
 }

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

@@ -0,0 +1,106 @@
+/**
+ * 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.TableName;
+
+import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 网格员信息
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2021-09-14
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("epdc_grid_member")
+public class GridMemberEntity extends BaseEpdcEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 姓名
+     */
+	private String name;
+
+    /**
+     * 头像
+     */
+	private String imgUrl;
+
+    /**
+     * 党员标识：0否1是
+     */
+	private String partyFlag;
+
+    /**
+     * 格言
+     */
+	private String motto;
+
+    /**
+     * 职责
+     */
+	private String duty;
+
+    /**
+     * 负责区域
+     */
+	private String territory;
+
+    /**
+     * 电话
+     */
+	private String mobile;
+
+    /**
+     * 所属网格名称
+     */
+	private String dept;
+
+    /**
+     * 所属网格id
+     */
+	private Long deptId;
+
+    /**
+     * 父所有部门
+     */
+	private String parentDeptIds;
+
+    /**
+     * 父所有部门
+     */
+	private String parentDeptNames;
+
+    /**
+     * 所有部门ID
+     */
+	private String allDeptIds;
+
+    /**
+     * 所有部门名称
+     */
+	private String allDeptNames;
+
+}

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

@@ -0,0 +1,95 @@
+/**
+ * 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-09-14
+ */
+@Data
+public class GridMemberExcel {
+
+    @Excel(name = "主键")
+    private String id;
+
+    @Excel(name = "姓名")
+    private String name;
+
+    @Excel(name = "头像")
+    private String imgUrl;
+
+    @Excel(name = "党员标识：0否1是")
+    private String partyFlag;
+
+    @Excel(name = "格言")
+    private String motto;
+
+    @Excel(name = "职责")
+    private String duty;
+
+    @Excel(name = "负责区域")
+    private String territory;
+
+    @Excel(name = "电话")
+    private String mobile;
+
+    @Excel(name = "所属网格名称")
+    private String dept;
+
+    @Excel(name = "所属网格id")
+    private Long deptId;
+
+    @Excel(name = "父所有部门")
+    private String parentDeptIds;
+
+    @Excel(name = "父所有部门")
+    private String parentDeptNames;
+
+    @Excel(name = "所有部门ID")
+    private String allDeptIds;
+
+    @Excel(name = "所有部门名称")
+    private String allDeptNames;
+
+    @Excel(name = "乐观锁")
+    private Integer revision;
+
+    @Excel(name = "创建人")
+    private String createdBy;
+
+    @Excel(name = "创建时间")
+    private Date createdTime;
+
+    @Excel(name = "更新人")
+    private String updatedBy;
+
+    @Excel(name = "更新时间")
+    private Date updatedTime;
+
+    @Excel(name = "删除标记")
+    private String delFlag;
+
+
+}

epdc-cloud-admin/src/main/java/com/elink/esua/epdc/redis/GridMemberRedis.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-09-14
+ */
+@Component
+public class GridMemberRedis {
+    @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/GridMemberService.java

@@ -0,0 +1,115 @@
+/**
+ * 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.AppMemberListFromDTO;
+import com.elink.esua.epdc.dto.GridMemberDTO;
+import com.elink.esua.epdc.entity.GridMemberEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 网格员信息
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2021-09-14
+ */
+public interface GridMemberService extends BaseService<GridMemberEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<GridMemberDTO>
+     * @author generator
+     * @date 2021-09-14
+     */
+    PageData<GridMemberDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<GridMemberDTO>
+     * @author generator
+     * @date 2021-09-14
+     */
+    List<GridMemberDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return GridMemberDTO
+     * @author generator
+     * @date 2021-09-14
+     */
+    GridMemberDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-09-14
+     */
+    void save(GridMemberDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-09-14
+     */
+    void update(GridMemberDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2021-09-14
+     */
+    void delete(String[] ids);
+
+    /**
+     * @describe: 居民端-网格队伍-社区介绍
+     * @author wangtong
+     * @date 2021/9/14 16:25
+     * @params [userDetail]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     */
+    Result getDeptInfo(AppMemberListFromDTO dto);
+
+    /**
+     * @describe: 居民端-网格队伍-网格员列表
+     * @author wangtong
+     * @date 2021/9/14 16:29
+     * @params [AppMemberListFromDTO]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     */
+    Result getMemberList(AppMemberListFromDTO dto);
+}

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

@@ -0,0 +1,151 @@
+/**
+ * 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.constant.NumConstant;
+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.GridMemberDao;
+import com.elink.esua.epdc.dao.SysDeptDao;
+import com.elink.esua.epdc.dao.SysDeptInfoDao;
+import com.elink.esua.epdc.dto.*;
+import com.elink.esua.epdc.entity.GridMemberEntity;
+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 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-09-14
+ */
+@Service
+public class GridMemberServiceImpl extends BaseServiceImpl<GridMemberDao, GridMemberEntity> implements GridMemberService {
+
+    @Autowired
+    private GridMemberRedis gridMemberRedis;
+
+    @Autowired
+    private OptSysDeptService optSysDeptService;
+
+    @Autowired
+    private SysDeptDao sysDeptDao;
+
+    @Autowired
+    private SysDeptInfoDao sysDeptInfoDao;
+
+    @Override
+    public PageData<GridMemberDTO> page(Map<String, Object> params) {
+        IPage<GridMemberDTO> page = getPage(params);
+        List<GridMemberDTO> list = baseDao.getPageList(params);
+        return new PageData<>(list, page.getTotal());
+    }
+
+    @Override
+    public List<GridMemberDTO> list(Map<String, Object> params) {
+        List<GridMemberEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, GridMemberDTO.class);
+    }
+
+    private QueryWrapper<GridMemberEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<GridMemberEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public GridMemberDTO get(String id) {
+        GridMemberEntity entity = baseDao.selectById(id);
+        GridMemberDTO result = ConvertUtils.sourceToTarget(entity, GridMemberDTO.class);
+        result.setAllDeptIdsShow(result.getAllDeptIds().split(","));
+        return result;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(GridMemberDTO dto) {
+        GridMemberEntity entity = ConvertUtils.sourceToTarget(dto, GridMemberEntity.class);
+        setGridMemberDeptInfo(dto,entity);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(GridMemberDTO dto) {
+        GridMemberEntity entity = ConvertUtils.sourceToTarget(dto, GridMemberEntity.class);
+        setGridMemberDeptInfo(dto,entity);
+        updateById(entity);
+    }
+
+    private void setGridMemberDeptInfo(GridMemberDTO dto,GridMemberEntity entity){
+        DeptLevelAndLeaderDTO deptLevel = optSysDeptService.getDeptLevelById(dto.getDeptId());
+        entity.setDept(deptLevel.getDeptName());
+        entity.setParentDeptIds(deptLevel.getParentDeptIds());
+        entity.setParentDeptNames(deptLevel.getParentDeptNames());
+        entity.setAllDeptIds(deptLevel.getAllDeptIds());
+        entity.setAllDeptNames(deptLevel.getAllDeptNames());
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+    @Override
+    public Result getDeptInfo(AppMemberListFromDTO dto) {
+        SysDeptEntity entity = sysDeptDao.selectById(dto.getDeptId());
+        AppDeptInfoResultDTO result = sysDeptInfoDao.selectByDeptId(entity.getPid());
+        if(result == null){
+            return new Result().error("未查到相关社区的简介信息");
+        }
+        result.setDeptName(sysDeptDao.selectById(entity.getPid()).getName());
+        return new Result().ok(result);
+    }
+
+    @Override
+    public Result getMemberList(AppMemberListFromDTO dto) {
+        SysDeptEntity entity = sysDeptDao.selectById(dto.getDeptId());
+        dto.setDeptId(entity.getPid());
+        int pageIndex = (dto.getPageIndex() - NumConstant.ONE) * dto.getPageSize();
+        dto.setPageIndex(pageIndex);
+        List<AppMemberListResultDTO> result = baseDao.getMemberList(dto);
+        return new Result().ok(result);
+    }
+
+}

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

@@ -151,7 +151,11 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
         updateById(entity);
 
         //更新用户物业关系
-        sysPropertyUserService.updatePropertyUser(entity.getId().toString(),dto.getProjectId());
+        if("".equals(sysPropertyUserService.getByUserId(entity.getId().toString())) || null==sysPropertyUserService.getByUserId(entity.getId().toString())){
+            sysPropertyUserService.savePropertyUser(entity.getId().toString(),dto.getProjectId());
+        }else {
+            sysPropertyUserService.updatePropertyUser(entity.getId().toString(),dto.getProjectId());
+        }
         //更新角色用户关系
         sysRoleUserService.saveOrUpdate(entity.getId(), dto.getRoleIdList());
 

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

@@ -0,0 +1,60 @@
+<?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.GridMemberDao">
+
+    <resultMap type="com.elink.esua.epdc.entity.GridMemberEntity" id="gridMemberMap">
+        <result property="id" column="ID"/>
+        <result property="name" column="NAME"/>
+        <result property="imgUrl" column="IMG_URL"/>
+        <result property="partyFlag" column="PARTY_FLAG"/>
+        <result property="motto" column="MOTTO"/>
+        <result property="duty" column="DUTY"/>
+        <result property="territory" column="TERRITORY"/>
+        <result property="mobile" column="MOBILE"/>
+        <result property="dept" column="DEPT"/>
+        <result property="deptId" column="DEPT_ID"/>
+        <result property="parentDeptIds" column="PARENT_DEPT_IDS"/>
+        <result property="parentDeptNames" column="PARENT_DEPT_NAMES"/>
+        <result property="allDeptIds" column="ALL_DEPT_IDS"/>
+        <result property="allDeptNames" column="ALL_DEPT_NAMES"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+    </resultMap>
+    <select id="getPageList" resultType="com.elink.esua.epdc.dto.GridMemberDTO">
+        select *
+        from epdc_grid_member
+        where DEL_FLAG='0'
+        <if test="mobile != null and mobile != ''">
+            and mobile like '%${mobile}%'
+        </if>
+        <if test="name != null and name != ''">
+            and name like '%${name}%'
+        </if>
+        <if test="deptId != null and deptId != ''">
+            and FIND_IN_SET(#{deptId},ALL_DEPT_IDS)
+        </if>
+        order by CREATED_TIME desc
+    </select>
+    <select id="getMemberList" resultType="com.elink.esua.epdc.dto.AppMemberListResultDTO">
+        select id,
+			 name,
+			 IMG_URL,
+			 motto,
+			 duty,
+			 party_flag,
+			 mobile,
+			 territory
+        from epdc_grid_member
+        where del_flag='0'
+			and FIND_IN_SET(#{deptId},ALL_DEPT_IDS)
+		order by CREATED_TIME desc
+		LIMIT #{pageIndex},#{pageSize}
+    </select>
+
+
+</mapper>

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

@@ -21,6 +21,12 @@
         <result property="updatedBy" column="UPDATED_BY"/>
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
+    <select id="selectByDeptId" resultType="com.elink.esua.epdc.dto.AppDeptInfoResultDTO">
+        SELECT INTRODUCTION as deptInfo
+        FROM `sys_dept_info`
+        where DEL_FLAG='0'
+              and DEPT_ID=#{deptId}
+    </select>
 
 
 </mapper>

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

@@ -228,9 +228,9 @@
             sys_user u
             LEFT JOIN sys_epmet_user_relation eur on u.id = eur.sys_user_id
         WHERE
-            U.DEL_FLAG = 0
+            u.DEL_FLAG = 0
             AND eur.DEL_FLAG = 0
-            AND eur.AGENCY_ID = #{deptId}
+            AND u.`dept_id` = #{deptId}
         ORDER BY
             eur.CREATED_TIME DESC
         LIMIT #{pageIndex}, #{pageSize}

epdc-cloud-client-yushan

@@ -1 +1 @@
-Subproject commit 40bd0613d9f3dd621d327713e3d7f15c656570f3
+Subproject commit 037ee6574bf347ae34d5251735a99c5511d81794

epdc-cloud-commons-yushan

@@ -1 +1 @@
-Subproject commit 31d32c81a8018a5c93745bcca1a538cc0bf59e13
+Subproject commit 9d7cf7e81ccc634751f032f72e5333a90eb40ee2