diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/dao/ConflictMediateDao.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/dao/ConflictMediateDao.java
index 5b50b82..cbdc574 100644
--- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/dao/ConflictMediateDao.java
+++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/dao/ConflictMediateDao.java
@@ -24,6 +24,7 @@ import com.elink.esua.epdc.modules.conflict.entity.ConflictMediateEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 矛盾纠纷调解情况
@@ -34,6 +35,16 @@ import java.util.List;
 @Mapper
 public interface ConflictMediateDao extends BaseDao<ConflictMediateEntity> {
 
+    /**
+     * 列表
+     *
+     * @return java.util.List<com.elink.esua.epdc.modules.psychology.entity.ConflictMediateEntity>
+     * @params [params]
+     * @author zhangyuan
+     * @since 2020/5/21 14:54
+     */
+    List<ConflictMediateEntity> selectListOfConflictMediate(Map<String, Object> params);
+
     /**
      * 工作端--矛盾纠纷历史上报列表
      *
diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/entity/ConflictMediateEntity.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/entity/ConflictMediateEntity.java
index 6bcd4a9..16de7ff 100644
--- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/entity/ConflictMediateEntity.java
+++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/entity/ConflictMediateEntity.java
@@ -18,8 +18,7 @@
 package com.elink.esua.epdc.modules.conflict.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
-import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity;
+import com.elink.esua.epdc.commons.mybatis.entity.DeptScope;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -34,7 +33,7 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper=false)
 @TableName("epdc_conflict_mediate")
-public class ConflictMediateEntity extends BaseEpdcEntity {
+public class ConflictMediateEntity extends DeptScope {
 
 	private static final long serialVersionUID = 1L;
 
@@ -43,6 +42,11 @@ public class ConflictMediateEntity extends BaseEpdcEntity {
      */
 	private Long userId;
 
+	/**
+	 * 提交人
+	 */
+	private String userName;
+
     /**
      * 矛盾纠纷类型
      */
diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/service/impl/ConflictMediateServiceImpl.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/service/impl/ConflictMediateServiceImpl.java
index c0c250d..08c1024 100644
--- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/service/impl/ConflictMediateServiceImpl.java
+++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/conflict/service/impl/ConflictMediateServiceImpl.java
@@ -20,9 +20,15 @@ package com.elink.esua.epdc.modules.conflict.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.mybatis.utils.DeptEntityUtils;
 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.security.user.SecurityUser;
+import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
 import com.elink.esua.epdc.dto.conflict.ConflictMediateDTO;
 import com.elink.esua.epdc.dto.conflict.form.ConflictMediateDetailFormDTO;
 import com.elink.esua.epdc.dto.conflict.form.ConflictMediateFormDTO;
@@ -33,6 +39,7 @@ import com.elink.esua.epdc.modules.conflict.dao.ConflictMediateDao;
 import com.elink.esua.epdc.modules.conflict.entity.ConflictMediateEntity;
 import com.elink.esua.epdc.modules.conflict.redis.ConflictMediateRedis;
 import com.elink.esua.epdc.modules.conflict.service.ConflictMediateService;
+import com.elink.esua.epdc.modules.feign.AdminFeignClient;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -54,13 +61,15 @@ public class ConflictMediateServiceImpl extends BaseServiceImpl<ConflictMediateD
     @Autowired
     private ConflictMediateRedis conflictMediateRedis;
 
+    @Autowired
+    private AdminFeignClient adminFeignClient;
+
     @Override
     public PageData<ConflictMediateDTO> page(Map<String, Object> params) {
-        IPage<ConflictMediateEntity> page = baseDao.selectPage(
-                getPage(params, FieldConstant.CREATED_TIME, false),
-                getWrapper(params)
-        );
-        return getPageData(page, ConflictMediateDTO.class);
+        IPage<ConflictMediateEntity> page = getPage(params);
+        List<ConflictMediateEntity> entityList = baseDao.selectListOfConflictMediate(params);
+        List<ConflictMediateDTO> list = ConvertUtils.sourceToTarget(entityList, ConflictMediateDTO.class);
+        return new PageData<>(list, page.getTotal());
     }
 
     @Override
@@ -109,7 +118,17 @@ public class ConflictMediateServiceImpl extends BaseServiceImpl<ConflictMediateD
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void submit(ConflictMediateFormDTO dto) {
+        UserDetail user = SecurityUser.getUser();
         ConflictMediateEntity entity = ConvertUtils.sourceToTarget(dto, ConflictMediateEntity.class);
+        if (user != null) {
+            entity.setUserName(user.getRealName());
+            ParentAndAllDeptDTO parentAndAllDeptDTO = getParentAndAllDeptDTO(user.getDeptId().toString());
+            // 保存机构，及其他冗余字段。
+            DeptEntityUtils.loadDeptInfo(
+                    ConvertUtils.sourceToTarget(parentAndAllDeptDTO, DeptEntityUtils.DeptDto.class),
+                    entity
+            );
+        }
         insert(entity);
     }
 
@@ -126,4 +145,23 @@ public class ConflictMediateServiceImpl extends BaseServiceImpl<ConflictMediateD
         ConflictMediateEntity entity = baseDao.getById(dto);
         return ConvertUtils.sourceToTarget(entity, ConflictMediateDetailResultDTO.class);
     }
+
+    /**
+     * 根据网格ID获取冗余的组织机构信息
+     *
+     * @param
+     * @return com.elink.esua.epdc.dto.ParentAndAllDeptDTO
+     * @author rongchao
+     * @since 2019-12-19
+     */
+    private ParentAndAllDeptDTO getParentAndAllDeptDTO(String gridId) {
+        // 获取组织结构冗余信息
+        Result<ParentAndAllDeptDTO> parentAndAllDeptDTOResult = adminFeignClient.getParentAndAllDept(gridId);
+        ParentAndAllDeptDTO parentAndAllDeptDTO = parentAndAllDeptDTOResult.getData();
+
+        if (!parentAndAllDeptDTOResult.success()) {
+            throw new RenException(parentAndAllDeptDTOResult.getMsg());
+        }
+        return parentAndAllDeptDTO;
+    }
 }
\ No newline at end of file
diff --git a/epdc-cloud-property/src/main/resources/mapper/conflict/ConflictMediateDao.xml b/epdc-cloud-property/src/main/resources/mapper/conflict/ConflictMediateDao.xml
index 136f921..c318983 100644
--- a/epdc-cloud-property/src/main/resources/mapper/conflict/ConflictMediateDao.xml
+++ b/epdc-cloud-property/src/main/resources/mapper/conflict/ConflictMediateDao.xml
@@ -6,6 +6,7 @@
     <resultMap type="com.elink.esua.epdc.modules.conflict.entity.ConflictMediateEntity" id="conflictMediateMap">
         <result property="id" column="ID"/>
         <result property="userId" column="USER_ID"/>
+        <result property="userName" column="USER_NAME"/>
         <result property="conflictType" column="CONFLICT_TYPE"/>
         <result property="conflictReason" column="CONFLICT_REASON"/>
         <result property="involvedNum" column="INVOLVED_NUM"/>
@@ -22,12 +23,39 @@
         <result property="createdTime" column="CREATED_TIME"/>
         <result property="updatedBy" column="UPDATED_BY"/>
         <result property="updatedTime" column="UPDATED_TIME"/>
+        <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"/>
     </resultMap>
     <sql id="Base_Column_List">
-        ID,	USER_ID,	CONFLICT_TYPE,	CONFLICT_REASON,	INVOLVED_NUM,	MAINSTAY_LEADER,	RESPONSIBLE_DEPT,
+        ID,	USER_ID,	USER_NAME,	CONFLICT_TYPE,	CONFLICT_REASON,	INVOLVED_NUM,	MAINSTAY_LEADER,	RESPONSIBLE_DEPT,
 	RESPONSIBLE_PEOPLE,	MAJOR_MEASURES,	CURRENT_SITUATION,	REMARK,	SUBMIT_TIME,
-	DEL_FLAG,	CREATED_BY,	CREATED_TIME,	UPDATED_BY,	UPDATED_TIME
+	DEL_FLAG,	CREATED_BY,	CREATED_TIME,	UPDATED_BY,	UPDATED_TIME,	PARENT_DEPT_IDS,
+        PARENT_DEPT_NAMES,	ALL_DEPT_IDS,	ALL_DEPT_NAMES
     </sql>
+    <select id="selectListOfConflictMediate" resultType="com.elink.esua.epdc.modules.conflict.entity.ConflictMediateEntity">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM
+        epdc_conflict_mediate
+        WHERE
+        DEL_FLAG = '0'
+        <if test="grid != null and grid != ''">
+            AND find_in_set(#{grid},ALL_DEPT_IDS)
+        </if>
+        <if test="comm != null and comm != ''">
+            AND find_in_set(#{comm},ALL_DEPT_IDS)
+        </if>
+        <if test="startTime != null and startTime != ''">
+            AND SUBMIT_TIME  &gt; #{startTime}
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND SUBMIT_TIME  &lt; #{endTime}
+        </if>
+        ORDER BY
+        CREATED_TIME DESC
+    </select>
     <select id="listConflictMediate" resultType="com.elink.esua.epdc.modules.conflict.entity.ConflictMediateEntity">
         SELECT
         <include refid="Base_Column_List"/>