diff --git a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysAnalysisMenuDTO.java b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysAnalysisMenuDTO.java
index ca85e22e3..fd6f5e9f7 100644
--- a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysAnalysisMenuDTO.java
+++ b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysAnalysisMenuDTO.java
@@ -17,9 +17,6 @@
 
 package com.elink.esua.epdc.dto;
 
-import java.io.Serializable;
-import java.util.Date;
-
 import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -29,6 +26,8 @@ import org.hibernate.validator.constraints.Range;
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.Date;
 
 
 /**
@@ -135,7 +134,7 @@ public class SysAnalysisMenuDTO implements Serializable {
     /**
      * 模块名称
      */
-	private String modelname;
+	private String modelName;
 
     /**
      * 绑定菜单id
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/SysParamsEntity.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/SysParamsEntity.java
index 59a6b8f29..35fb90b66 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/SysParamsEntity.java
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/SysParamsEntity.java
@@ -10,6 +10,7 @@ package com.elink.esua.epdc.entity;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.elink.esua.epdc.commons.mybatis.entity.BaseEntity;
 import lombok.Data;
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDictServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDictServiceImpl.java
index 5b5a69ffa..4e82bbba2 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDictServiceImpl.java
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDictServiceImpl.java
@@ -77,7 +77,7 @@ public class SysDictServiceImpl extends BaseServiceImpl<SysDictDao, SysDictEntit
 
         QueryWrapper<SysDictEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(pid), "pid", Long.parseLong(pid));
-        wrapper.eq(StringUtils.isNotBlank(dictType), "dict_type", dictType);
+        wrapper.like(StringUtils.isNotBlank(dictType), "dict_type", dictType);
         wrapper.like(StringUtils.isNotBlank(dictName), "dict_name", dictName);
         wrapper.like(StringUtils.isNotBlank(dictValue), "dict_value", dictValue);
 
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysRoleDao.xml b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysRoleDao.xml
index c8cc9d182..51ab31fed 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysRoleDao.xml
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysRoleDao.xml
@@ -14,7 +14,11 @@
             LEFT JOIN sys_user u ON u.id = ru.user_id
         WHERE
             r.type_key = #{roleType} AND u.id != ''
-            AND d.id in (<foreach collection="deptIdList" item="item" separator=",">#{item}</foreach>)
+            <if test="deptIdList.size>0 and deptIdList!=null">
+                AND d.id in (
+                <foreach collection="deptIdList" item="item" separator=",">#{item}</foreach>
+            )
+            </if>
         GROUP BY
             d.id
     </select>
diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/dao/GridOperatorDutyCategoryDao.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/dao/GridOperatorDutyCategoryDao.java
index cc73799f0..ba026c5a1 100644
--- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/dao/GridOperatorDutyCategoryDao.java
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/dao/GridOperatorDutyCategoryDao.java
@@ -20,6 +20,8 @@ import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
 import com.elink.esua.epdc.modules.consult.entity.GridOperatorDutyCategoryEntity;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 职责分类管理
  *
@@ -28,5 +30,13 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface GridOperatorDutyCategoryDao extends BaseDao<GridOperatorDutyCategoryEntity> {
-	
-}
\ No newline at end of file
+    /**
+    * @Description: 判断权限编码是否重复
+    * @Param: [dutyCategoryName]
+    * @return: java.util.List<com.elink.esua.epdc.modules.consult.entity.GridOperatorDutyCategoryEntity>
+    * @Author: wk
+    * @Date: 2020/7/28
+    */
+    List<GridOperatorDutyCategoryEntity> seleCategoryName(String dutyCategoryName);
+
+}
diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/service/impl/GridOperatorDutyCategoryServiceImpl.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/service/impl/GridOperatorDutyCategoryServiceImpl.java
index 27e339af9..09667c04b 100644
--- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/service/impl/GridOperatorDutyCategoryServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/service/impl/GridOperatorDutyCategoryServiceImpl.java
@@ -89,6 +89,8 @@ public class GridOperatorDutyCategoryServiceImpl extends BaseServiceImpl<GridOpe
     @Transactional(rollbackFor = Exception.class)
     public void save(GridOperatorDutyCategoryDTO dto) {
         GridOperatorDutyCategoryEntity entity = ConvertUtils.sourceToTarget(dto, GridOperatorDutyCategoryEntity.class);
+       //判断权限编码是否重复dutyCategoryName权限编码
+        repetitionName(entity.getDutyCategoryName());
         insert(entity);
     }
 
@@ -96,6 +98,8 @@ public class GridOperatorDutyCategoryServiceImpl extends BaseServiceImpl<GridOpe
     @Transactional(rollbackFor = Exception.class)
     public void update(GridOperatorDutyCategoryDTO dto) {
         GridOperatorDutyCategoryEntity entity = ConvertUtils.sourceToTarget(dto, GridOperatorDutyCategoryEntity.class);
+        //判断权限编码是否重复dutyCategoryName权限编码
+        repetitionName(entity.getDutyCategoryName());
         updateById(entity);
     }
 
@@ -109,5 +113,19 @@ public class GridOperatorDutyCategoryServiceImpl extends BaseServiceImpl<GridOpe
         }
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
+    /**
+    * @Description: 判断权限编码是否重复
+    * @Param: [dutyCategoryName]
+    * @return: void
+    * @Author: wk
+    * @Date: 2020/7/28
+    */
+    public void repetitionName(String dutyCategoryName){
+        List<GridOperatorDutyCategoryEntity> list = baseDao.seleCategoryName(dutyCategoryName);
+        if (null!=list && list.size()>0){
+            throw new RenException("网格专员职责类别名称重复");
+        }
+
+    }
 
-}
\ No newline at end of file
+}
diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/excel/EvaluateOfficerExcel.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/excel/EvaluateOfficerExcel.java
index a2359e974..e7429598c 100644
--- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/excel/EvaluateOfficerExcel.java
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/excel/EvaluateOfficerExcel.java
@@ -44,14 +44,18 @@ public class EvaluateOfficerExcel {
     @Excel(name = "单位职务")
     private String position;
 
+    @Excel(name = "创建时间")
+    private String createTime;
+
     @Excel(name = "排序")
     private Integer sort;
 
-    @Excel(name = "点赞次数")
-    private Integer likesCount;
 
-    @Excel(name = "被踩次数")
-    private Integer opposeCount;
+//    @Excel(name = "点赞次数")
+//    private Integer likesCount;
+//
+//    @Excel(name = "被踩次数")
+//    private Integer opposeCount;
 
    /* @Excel(name = "乐观锁")
     private Integer revision;
@@ -72,4 +76,4 @@ public class EvaluateOfficerExcel {
     private Date updatedTime;*/
 
 
-}
\ No newline at end of file
+}
diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/consult/GridOperatorDutyCategoryDao.xml b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/consult/GridOperatorDutyCategoryDao.xml
index 5f4e3a5f2..99f344a58 100644
--- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/consult/GridOperatorDutyCategoryDao.xml
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/consult/GridOperatorDutyCategoryDao.xml
@@ -13,6 +13,15 @@
         <result property="updatedBy" column="UPDATED_BY"/>
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
+    <select id="seleCategoryName" parameterType="java.lang.String" resultMap="gridOperatorDutyCategoryMap">
+        SELECT
+            *
+        FROM
+            epdc_grid_operator_duty_category
+        WHERE
+            DEL_FLAG = 0
+            AND DUTY_CATEGORY_NAME = #{dutyCategoryName}
+    </select>
 
 
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateDeptDao.xml b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateDeptDao.xml
index 134c96939..2041e2b38 100644
--- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateDeptDao.xml
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateDeptDao.xml
@@ -62,11 +62,11 @@
         dept.DEPT_ID,
         dept.DEPT_NAME,
         dept.OFFICER_COUNT,
-        evaluatePeopleCount,
-        beEvaluatedCount,
-        evaluateCount,
-        likeCount,
-        opposeCount
+        IFNULL(evaluatePeopleCount,0) AS evaluatePeopleCount,
+        IFNULL(beEvaluatedCount,0) AS beEvaluatedCount,
+        IFNULL(evaluateCount,0) AS evaluateCount,
+        IFNULL(likeCount,0) AS likeCount,
+        IFNULL(opposeCount,0) AS opposeCount
         FROM
         epdc_evaluate_dept dept
         LEFT JOIN (
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemPendingHandleDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemPendingHandleDTO.java
index e88e9c1fd..187c82235 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemPendingHandleDTO.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemPendingHandleDTO.java
@@ -30,6 +30,11 @@ public class ItemPendingHandleDTO implements Serializable {
      * 提交人
      */
     private String nickName;
+
+    /**
+     * 手机号
+     */
+    private String mobile;
     /**
      * 项目满意度
      */
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml
index 466bae52e..74273ed1c 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml
@@ -6,7 +6,7 @@
         SELECT
         issue.ID,
         issue.ISSUE_CONTENT AS issueContent,
-        e.CREATED_TIME AS createdTime,
+        issue.CREATED_TIME AS createdTime,
         e.NICK_NAME AS nickName,
         e.APPROVE_NUM AS approveNum,
         e.OPPOSE_NUM AS opposeNum,
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml
index 103c1b0a7..8f0dd1385 100755
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml
@@ -394,6 +394,7 @@
             item.ITEM_CODE,
             item.CREATED_TIME,
             item.NICK_NAME,
+            item.MOBILE,
             CASE item.EVALUATION_SCORE
             WHEN 0 THEN '不满意'
             WHEN 1 THEN '基本满意'
diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/controller/GroupController.java b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/controller/GroupController.java
index ff7518ae6..be0614e3f 100644
--- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/controller/GroupController.java
+++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/controller/GroupController.java
@@ -47,7 +47,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("group")
 public class GroupController {
-    
+
     @Autowired
     private GroupService groupService;
 
@@ -145,7 +145,11 @@ public class GroupController {
      */
     @GetMapping("groupList")
     public Result<List<GroupListDTO>> groupList() {
-        List<GroupListDTO> data = groupService.listOfGroupByGridId(SecurityUser.getDeptId());
+        String deptId =   SecurityUser.getUser().getDeptId().toString();
+        if(null ==deptId){
+            deptId = null;
+        }
+        List<GroupListDTO> data = groupService.listOfGroupByGridId(deptId);
         return new Result<List<GroupListDTO>>().ok(data);
     }
 
@@ -181,4 +185,4 @@ public class GroupController {
         return new Result<PageData<GroupMemberDTO>>().ok(page);
     }
 
-}
\ No newline at end of file
+}
diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/dao/GroupDao.java b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/dao/GroupDao.java
index 7b1db6363..6a7e31a15 100644
--- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/dao/GroupDao.java
+++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/dao/GroupDao.java
@@ -26,6 +26,7 @@ import com.elink.esua.epdc.dto.group.result.GroupsOfMineResultDTO;
 import com.elink.esua.epdc.dto.group.result.GroupsOfRecommendResultDTO;
 import com.elink.esua.epdc.modules.group.entity.GroupEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
@@ -114,7 +115,7 @@ public interface GroupDao extends BaseDao<GroupEntity> {
      * @author liuchuang
      * @since 2019/11/12 9:35
      */
-    List<GroupListDTO> selectListOfGroupByGridId(Long deptId);
+    List<GroupListDTO> selectListOfGroupByGridId(@Param("deptId") String deptId);
 
     /**
      *
@@ -157,14 +158,14 @@ public interface GroupDao extends BaseDao<GroupEntity> {
      * @Date 2019/12/19 13:08
      **/
 	List<String> listPartyMemberGridId();
-	
-	/** 
-	 * @Description: 根据社群id，查询群主手机号 
-	 * @Param: [groupId] 
-	 * @return: java.lang.String 
-	 * @Author: zy 
-	 * @Date: 2020-01-08 
-	 */ 
+
+	/**
+	 * @Description: 根据社群id，查询群主手机号
+	 * @Param: [groupId]
+	 * @return: java.lang.String
+	 * @Author: zy
+	 * @Date: 2020-01-08
+	 */
 	String queryGroupUserMOBILE(String groupId);
 
     /**
diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/GroupService.java b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/GroupService.java
index e15319a6b..b09e84fa0 100644
--- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/GroupService.java
+++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/GroupService.java
@@ -228,7 +228,7 @@ public interface GroupService extends BaseService<GroupEntity> {
      * @author liuchuang
      * @since 2019/11/12 9:33
      */
-    List<GroupListDTO> listOfGroupByGridId(Long deptId);
+    List<GroupListDTO> listOfGroupByGridId(String deptId);
 
     /**
      *
diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/impl/GroupServiceImpl.java b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/impl/GroupServiceImpl.java
index bc0f431b3..9ba021a5e 100644
--- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/impl/GroupServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/impl/GroupServiceImpl.java
@@ -369,7 +369,7 @@ public class GroupServiceImpl extends BaseServiceImpl<GroupDao, GroupEntity> imp
     }
 
     @Override
-    public List<GroupListDTO> listOfGroupByGridId(Long deptId) {
+    public List<GroupListDTO> listOfGroupByGridId(String deptId) {
         return baseDao.selectListOfGroupByGridId(deptId);
     }
 
diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/group/GroupDao.xml b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/group/GroupDao.xml
index 5cedcb05b..1892f866f 100644
--- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/group/GroupDao.xml
+++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/group/GroupDao.xml
@@ -271,7 +271,7 @@ ORDER BY
             AND gp.ID = #{id}
     </select>
 
-    <select id="selectListOfGroupByGridId" resultType="com.elink.esua.epdc.dto.group.GroupListDTO">
+    <select id="selectListOfGroupByGridId"  resultType="com.elink.esua.epdc.dto.group.GroupListDTO">
         SELECT
             ID AS groupId,
             GROUP_NAME AS groupName
@@ -280,7 +280,9 @@ ORDER BY
         WHERE
             DEL_FLAG = '0'
             AND STATE IN ( 10, 15, 20 )
-            AND GRID_ID = #{deptId}
+            <if test="deptId!=null">
+                AND GRID_ID = #{deptId}
+            </if>
     </select>
 
     <select id="selectListOfGroupOrderByActivity" resultType="com.elink.esua.epdc.dto.group.GroupActivityDTO">
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/phrases/service/impl/ActPhraseServiceImpl.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/phrases/service/impl/ActPhraseServiceImpl.java
index 25628a3c3..336b8f732 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/phrases/service/impl/ActPhraseServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/phrases/service/impl/ActPhraseServiceImpl.java
@@ -128,6 +128,12 @@ public class ActPhraseServiceImpl extends BaseServiceImpl<ActPhraseDao, ActPhras
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void update(ActPhraseDTO dto) {
+        String categoryCode = dto.getCode();
+        if (StringUtils.isNotBlank(categoryCode)) {
+            if (getCodeCount(dto) > 0) {
+                throw new RenException("您输入的编码已存在");
+            }
+        }
         ActPhraseEntity entity = ConvertUtils.sourceToTarget(dto, ActPhraseEntity.class);
         updateById(entity);
 
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActUserRelationDao.xml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActUserRelationDao.xml
index 5ea3a7247..0c4ef5b43 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActUserRelationDao.xml
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActUserRelationDao.xml
@@ -92,10 +92,10 @@
             AND relation.STATUS = #{status}
         </if>
         <if test="mobile != null and mobile != ''">
-            AND relation.MOBILE = #{mobile}
+            AND relation.MOBILE like '%${mobile}%'
         </if>
         <if test="realName != null and realName != ''">
-            AND relation.REAL_NAME = #{realName}
+            AND relation.REAL_NAME like '%${realName}%'
         </if>
         <if test="actId != null and actId != ''">
             AND relation.ACT_ID = #{actId}
@@ -168,10 +168,10 @@
             AND relation.STATUS = #{status}
         </if>
         <if test="mobile != null and mobile != ''">
-            AND relation.MOBILE = #{mobile}
+            AND relation.MOBILE like '%${mobile}%'
         </if>
         <if test="realName != null and realName != ''">
-            AND relation.REAL_NAME = #{realName}
+            AND relation.REAL_NAME like '%${realName}%'
         </if>
         <if test="actId != null and actId != ''">
             AND relation.ACT_ID = #{actId}
diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/impl/ScheduleJobServiceImpl.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/impl/ScheduleJobServiceImpl.java
index db1b46944..fa8b480ec 100644
--- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/impl/ScheduleJobServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/impl/ScheduleJobServiceImpl.java
@@ -11,6 +11,7 @@ package com.elink.esua.epdc.service.impl;
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.elink.esua.epdc.commons.tools.exception.RenException;
 import com.elink.esua.epdc.entity.ScheduleJobEntity;
 import com.elink.esua.epdc.utils.ScheduleUtils;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
@@ -66,11 +67,15 @@ public class ScheduleJobServiceImpl extends BaseServiceImpl<ScheduleJobDao, Sche
     @Transactional(rollbackFor = Exception.class)
     public void save(ScheduleJobDTO dto) {
         ScheduleJobEntity entity = ConvertUtils.sourceToTarget(dto, ScheduleJobEntity.class);
-
         entity.setStatus(ScheduleStatusEnum.NORMAL.value());
-        this.insert(entity);
+        try{
+            ScheduleUtils.createScheduleJob(scheduler, entity);
+            this.insert(entity);
+        }catch (Exception e){
+            throw new RenException("请输入正确的表达式");
+        }
+
 
-        ScheduleUtils.createScheduleJob(scheduler, entity);
     }
 
     @Override
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/form/KpiRuleSaveOrUpdateFormDTO.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/form/KpiRuleSaveOrUpdateFormDTO.java
index ad68645e7..b9b49e7a4 100644
--- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/form/KpiRuleSaveOrUpdateFormDTO.java
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/form/KpiRuleSaveOrUpdateFormDTO.java
@@ -53,7 +53,7 @@ public class KpiRuleSaveOrUpdateFormDTO implements Serializable {
 	/**
 	 * 考核部门类别
 	 */
-	@NotBlank(message = "考核部门类别不能为空")
+//	@NotBlank(message = "考核部门类别不能为空")
 	private String deptTypeKey;
 
 
diff --git a/esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/java/com/elink/esua/epdc/service/impl/SysMailLogServiceImpl.java b/esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/java/com/elink/esua/epdc/service/impl/SysMailLogServiceImpl.java
index 9899ac5d4..f00695dec 100644
--- a/esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/java/com/elink/esua/epdc/service/impl/SysMailLogServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/java/com/elink/esua/epdc/service/impl/SysMailLogServiceImpl.java
@@ -12,7 +12,6 @@ import com.alibaba.fastjson.JSON;
 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.service.impl.BaseServiceImpl;
 import com.elink.esua.epdc.commons.tools.constant.Constant;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.dao.SysMailLogDao;
@@ -43,7 +42,7 @@ public class SysMailLogServiceImpl extends BaseServiceImpl<SysMailLogDao, SysMai
         String status = (String)params.get("status");
 
         QueryWrapper<SysMailLogEntity> wrapper = new QueryWrapper<>();
-        wrapper.eq(StringUtils.isNotBlank(templateId),"template_id", templateId);
+        wrapper.like(StringUtils.isNotBlank(templateId),"template_id", templateId);
         wrapper.like(StringUtils.isNotBlank(mailTo), "mail_to", mailTo);
         wrapper.eq(StringUtils.isNotBlank(status),"status", status);
 
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/PartyMembersDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/PartyMembersDTO.java
index a89356120..aedb8e61d 100755
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/PartyMembersDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/PartyMembersDTO.java
@@ -17,11 +17,10 @@
 
 package com.elink.esua.epdc.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import java.util.List;
-
-import lombok.Data;
 
 
 /**
@@ -56,6 +55,8 @@ public class PartyMembersDTO implements Serializable {
 
 	private String registFlag;
 
+	private String registName;
+
 	private Date registTime;
 
 	private String streetName;
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/PartyMembersController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/PartyMembersController.java
index 041c651c6..99bcee5da 100755
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/PartyMembersController.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/PartyMembersController.java
@@ -160,7 +160,7 @@ public class PartyMembersController {
     @GetMapping("hasAuthenticationexport")
 //    @DataFilter(tableAlias = "eu", prefix = "AND", isPendingCreator = false)
     public void hasAuthenticationexport(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
-        ExcelUtils.exportExcelToTarget(response, "已认证党员", partyMembersService.optimizeHasAuthenticationPartyExport(params), PartyMembersExcel.class);
+        ExcelUtils.exportExcelToTarget(response, "已认证党员", partyMembersService.optimizeHasAuthenticationPartyExportNew(params), PartyMembersExcel.class);
     }
 
     /***
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/PartyMembersDao.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/PartyMembersDao.java
index 9a482741e..7a78463b0 100755
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/PartyMembersDao.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/PartyMembersDao.java
@@ -22,9 +22,7 @@ import com.elink.esua.epdc.dto.PartyMembersDTO;
 import com.elink.esua.epdc.entity.PartyMembersEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import org.springframework.web.bind.annotation.PathVariable;
 
-import java.io.Serializable;
 import java.util.List;
 import java.util.Map;
 
@@ -85,6 +83,8 @@ public interface PartyMembersDao extends BaseDao<PartyMembersEntity> {
 
     List<PartyMembersDTO> optimizeHasAuthenticationPartyPageInfo(@Param("userIdList") List<String> userIdList);
 
+    List<PartyMembersDTO> optimizeHasAuthenticationPartyPageInfoNew(@Param("userIdList") List<String> userIdList);
+
     /***
      * 删除时校验党员是否被认证
      * @param IdentityNo
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/PartyMembersExcel.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/PartyMembersExcel.java
index 5cf674f62..a4dadce0c 100755
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/PartyMembersExcel.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/PartyMembersExcel.java
@@ -34,20 +34,14 @@ public class PartyMembersExcel {
     @Excel(name = "姓名")
     private String realName;
 
-    @Excel(name = "联系电话")
+    @Excel(name = "手机号")
     private String mobile;
 
     @Excel(name = "身份证号")
     private String identityNo;
 
-    @Excel(name = "职务")
-    private String post;
-
-    @Excel(name = "干部下沉", replace = {"下沉_1", "不下沉_0"})
-    private String cadreFlag;
-
-    @Excel(name = "是否注册", replace = {"是_1", "否_0"})
-    private String registFlag;
+    @Excel(name = "注册状态")
+    private String  registName;
 
     @Excel(name = "认证时间", format = "yyyy-MM-dd HH:mm:ss")
     private Date registTime;
@@ -57,4 +51,14 @@ public class PartyMembersExcel {
 
     @Excel(name = "街道-社区-网格")
     private String allDeptNames;
+
+    @Excel(name = "职务")
+    private String post;
+
+    @Excel(name = "干部下沉", replace = {"下沉_1", "不下沉_0"})
+    private String cadreFlag;
+
+    @Excel(name = "是否注册", replace = {"是_1", "否_0"})
+    private String registFlag;
+
 }
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/PartyMembersService.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/PartyMembersService.java
index 564c9f7e3..ce27fe0d1 100755
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/PartyMembersService.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/PartyMembersService.java
@@ -23,7 +23,6 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.PartyMembersDTO;
 import com.elink.esua.epdc.entity.PartyMembersEntity;
 import com.elink.esua.epdc.entity.UserEntity;
-import com.elink.esua.epdc.excel.PartyMembersExcel;
 import com.elink.esua.epdc.rocketmq.dto.OrganizationModifyDTO;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -123,6 +122,8 @@ public interface PartyMembersService extends BaseService<PartyMembersEntity> {
 
     List<PartyMembersDTO> optimizeHasAuthenticationPartyExport(Map<String, Object> params);
 
+    List<PartyMembersDTO> optimizeHasAuthenticationPartyExportNew(Map<String, Object> params);
+
     /***
      * 通过身份证校验此党员是否被认证
      * @param IdentityNo
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyAuthenticationFailedServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyAuthenticationFailedServiceImpl.java
index 254bf7bd7..89f06fd92 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyAuthenticationFailedServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyAuthenticationFailedServiceImpl.java
@@ -20,7 +20,6 @@ package com.elink.esua.epdc.service.impl;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.elink.esua.epdc.commons.dynamic.datasource.annotation.DataSource;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
-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.security.user.SecurityUser;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
@@ -31,7 +30,6 @@ import com.elink.esua.epdc.entity.PartyAuthenticationFailedEntity;
 import com.elink.esua.epdc.rocketmq.dto.OrganizationModifyDTO;
 import com.elink.esua.epdc.service.PartyAuthenticationFailedService;
 import com.elink.esua.epdc.util.AppUserUtils;
-import com.google.common.collect.Lists;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -55,10 +53,10 @@ public class PartyAuthenticationFailedServiceImpl extends BaseServiceImpl<PartyA
     public PageData<PartyAuthenticationFailedDTO> page(Map<String, Object> params) {
 
         String[] paramKeys = new String[]{"realName", "identityNo", "startTime", "endTime", "mobile"};
-        if (AppUserUtils.isDefaultQuery(params, paramKeys)) {
-            List<PartyAuthenticationFailedDTO> userDtoList = Lists.newArrayList();
-            return new PageData<>(userDtoList, NumConstant.ZERO);
-        }
+//        if (AppUserUtils.isDefaultQuery(params, paramKeys)) {
+//            List<PartyAuthenticationFailedDTO> userDtoList = Lists.newArrayList();
+//            return new PageData<>(userDtoList, NumConstant.ZERO);
+//        }
 
         // 党员认证失败页面 查询条件：姓名, 手机号, 身份证号, 后端处理前后空格
         paramKeys = new String[]{"realName", "identityNo", "mobile"};
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java
index 518271906..d0836cc49 100755
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java
@@ -111,9 +111,9 @@ public class PartyMembersServiceImpl extends BaseServiceImpl<PartyMembersDao, Pa
 
         List<PartyMembersDTO> list = Lists.newArrayList();
         // 是否是进入页面时的默认查询
-        if (isDefaultQuery(params)) {
-            return new PageData<>(list, NumConstant.ZERO);
-        }
+//        if (isDefaultQuery(params)) {
+//            return new PageData<>(list, NumConstant.ZERO);
+//        }
 
         params = trimParamValue(params);
         IPage<PartyMembersDTO> page = getPage(params);
@@ -181,6 +181,15 @@ public class PartyMembersServiceImpl extends BaseServiceImpl<PartyMembersDao, Pa
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void save(PartyMembersDTO dto) {
+        List<PartyMembersEntity> partyMembersEntityList = baseDao.selectList(new QueryWrapper<PartyMembersEntity>());
+        // 去空格
+        List<PartyMembersExcel> partyList = new ArrayList<>();
+        // 校验数据
+        String message = this.checkExcelNew(dto, partyMembersEntityList);
+        if (StringUtils.isNotBlank(message)) {
+            throw new RenException(message);
+        }
+
         PartyMembersEntity entity = new PartyMembersEntity();
         entity.setCadreFlag(dto.getCadreFlag());
         entity.setRealName(dto.getRealName());
@@ -216,6 +225,27 @@ public class PartyMembersServiceImpl extends BaseServiceImpl<PartyMembersDao, Pa
         }
     }
 
+    private String checkExcelNew(PartyMembersDTO dto, List<PartyMembersEntity> partyMembersEntityList) {
+        // 不匹配信息
+        String result = null;
+        EpdcPartyErroyResultDTO errorLineinfoDto;
+            if (StringUtils.isBlank(dto.getRealName())) {
+                result = "姓名为空";
+            }
+            if (StringUtils.isBlank(dto.getIdentityNo())) {
+                result = "身份证号为空";
+            }
+            for (PartyMembersEntity item : partyMembersEntityList) {
+                if (StringUtils.isNotBlank(item.getMobile()) && item.getMobile().equals(dto.getMobile())) {
+                    result = "手机号已存在";
+                }
+                if (item.getIdentityNo().equals(dto.getIdentityNo())) {
+                    result = "身份证号已存在";
+                }
+            }
+        return result;
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void update(PartyMembersDTO dto) {
@@ -533,6 +563,20 @@ public class PartyMembersServiceImpl extends BaseServiceImpl<PartyMembersDao, Pa
 
     }
 
+    @Override
+    public List<PartyMembersDTO> optimizeHasAuthenticationPartyExportNew(Map<String, Object> params) {
+        params.put("deptIdList", SecurityUser.getUser().getDeptIdList());
+//        IPage<String> page = getPage(params);
+        List<String> userIds = baseDao.optimizeHasAuthenticationPartyPage(params);
+        if (userIds.size() > 0) {
+            List<PartyMembersDTO> partyMembersDTOList = baseDao.optimizeHasAuthenticationPartyPageInfoNew(userIds);
+            return partyMembersDTOList;
+        } else {
+            return new ArrayList<PartyMembersDTO>();
+        }
+
+    }
+
     @Override
     public Integer checkCertificationByIdentityNo(String IdentityNo) {
         return baseDao.selectCountByIdentity(IdentityNo);
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserTagServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserTagServiceImpl.java
index dfc734a36..0745c353a 100755
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserTagServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserTagServiceImpl.java
@@ -88,8 +88,8 @@ public class UserTagServiceImpl extends BaseServiceImpl<UserTagDao, UserTagEntit
         wrapper.eq(StringUtils.isNotBlank(dto.getTagCode()), "TAG_CODE", dto.getTagCode())
                 .ne(StringUtils.isNotBlank(dto.getId()), "id", dto.getId());
         List<UserTagEntity> list = baseDao.selectList(wrapper);
-        if (null != list || list.size() > 0) {
-            return new Result().error("编码有已存在");
+        if (null != list && list.size() > 0) {
+            return new Result().error("编码已存在");
         }
         UserTagEntity entity = ConvertUtils.sourceToTarget(dto, UserTagEntity.class);
 
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyAuthenticationFailedDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyAuthenticationFailedDao.xml
index 1d3aa5f89..bc907e99b 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyAuthenticationFailedDao.xml
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyAuthenticationFailedDao.xml
@@ -45,12 +45,11 @@
         FROM epdc_party_authentication_failed epaf
         WHERE
           epaf.del_flag = '0'
-          <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
-              and epaf.created_time between #{startTime} and #{endTime}
-          </if>
-          <if test="identityNo != '' and identityNo != null"> and epaf.IDENTITY_NO = #{identityNo}</if>
-          <if test="realName != '' and realName != null"> and epaf.real_name = #{realName}</if>
-          <if test="mobile != '' and mobile != null"> and epaf.mobile = #{mobile}</if>
+          <if test="startTime != null and startTime != '' ">and DATE_FORMAT( epaf.created_time, '%Y-%m-%d' ) >= #{startTime}</if>
+          <if test="endTime != null and endTime != '' "> <![CDATA[ and DATE_FORMAT(epaf.created_time,'%Y-%m-%d') <= ]]> #{endTime}</if>
+          <if test="identityNo != '' and identityNo != null"> and epaf.IDENTITY_NO like '%${identityNo}%'</if>
+          <if test="realName != '' and realName != null"> and epaf.real_name like '%${realName}%'</if>
+          <if test="mobile != '' and mobile != null"> and epaf.mobile like '%${mobile}%'</if>
         ORDER BY
         epaf.CREATED_TIME desc
     </select>
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyMembersDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyMembersDao.xml
index f913d6f45..f41ad4fcf 100755
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyMembersDao.xml
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyMembersDao.xml
@@ -75,10 +75,10 @@
             and pm.POST_ID = #{postId}
         </if>
         <if test="startTime != null and startTime != '' ">
-            and pm.REGIST_TIME >= #{startTime}
+            and DATE_FORMAT(pm.REGIST_TIME,'%Y-%m-%d') >= #{startTime}
         </if>
         <if test="endTime != null and endTime != '' ">
-            <![CDATA[ and pm.REGIST_TIME <= ]]> #{endTime}
+            <![CDATA[ and DATE_FORMAT(pm.REGIST_TIME,'%Y-%m-%d') <= ]]> #{endTime}
         </if>
         GROUP BY
         pm.ID
@@ -100,13 +100,13 @@
         AND ut.DEL_FLAG = '0'
         WHERE
         eu.PARTY_FLAG = '1' and eu.DEL_FLAG = '0'
-        <if test="realName != null and realName != '' ">and pm.REAL_NAME = #{realName}</if>
-        <if test="mobile != null and mobile != '' ">and pm.MOBILE = #{mobile}</if>
-        <if test="identityNo != null and identityNo != '' ">and pm.IDENTITY_NO = #{identityNo}</if>
+        <if test="realName != null and realName != '' ">and pm.REAL_NAME like '%${realName}%'</if>
+        <if test="mobile != null and mobile != '' ">and pm.MOBILE like '%${mobile}%'</if>
+        <if test="identityNo != null and identityNo != '' ">and pm.IDENTITY_NO like '%${identityNo}%'</if>
         <if test="registFlag != null and registFlag != '' ">and pm.REGIST_FLAG = #{registFlag}</if>
         <if test="postId != null and postId != '' ">and pm.POST_ID = #{postId}</if>
-        <if test="startTime != null and startTime != '' ">and pm.REGIST_TIME >= #{startTime}</if>
-        <if test="endTime != null and endTime != '' "> <![CDATA[ and pm.REGIST_TIME <= ]]> #{endTime}</if>
+        <if test="startTime != null and startTime != '' ">and DATE_FORMAT(pm.REGIST_TIME,'%Y-%m-%d') >= #{startTime}</if>
+        <if test="endTime != null and endTime != '' "> <![CDATA[ and DATE_FORMAT(pm.REGIST_TIME,'%Y-%m-%d') <= ]]> #{endTime}</if>
         <if test="streetId != '' and streetId != null">
             AND (find_in_set(#{streetId},eu.PARENT_DEPT_IDS) OR find_in_set(#{streetId},eu.ALL_DEPT_IDS))
         </if>
@@ -213,7 +213,7 @@
         WHERE
         DEL_FLAG = '0'
         AND AUTHENTICATED_TYPE IN ( '0', '1' )
-        <if test="endTime != ''">
+        <if test="endTime != null and endTime != ''">
             and DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') &lt;= #{endTime}
         </if>
         AND USER_ID = uu.ID
@@ -230,7 +230,7 @@
         WHERE
         DEL_FLAG = '0'
         AND AUTHENTICATED_TYPE IN ( '0', '1' )
-        <if test="endTime != ''">
+        <if test="endTime != null and endTime != ''">
             and DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') &lt;= #{endTime}
         </if>
         AND USER_ID = uu.ID
@@ -248,7 +248,7 @@
         DEL_FLAG = '0'
         AND AUTHENTICATED_TYPE IN ( '0', '1' )
         AND AUTHENTICATED_FLAG = '1'
-        <if test="endTime != ''">
+        <if test="endTime != null and endTime != ''">
             and DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') &lt;= #{endTime}
         </if>
         AND USER_ID = uu.ID
@@ -326,6 +326,60 @@
         ORDER BY
             allu.registTime DESC
     </select>
+    <select id="optimizeHasAuthenticationPartyPageInfoNew" resultType="com.elink.esua.epdc.dto.PartyMembersDTO">
+        SELECT
+        pm.CADRE_FLAG,
+        pm.CREATED_BY,
+        pm.DEPT_ID,
+        pm.ID,
+        pm.POST,
+        pm.POST_VALUE,
+        pm.REGIST_FLAG,
+            CASE pm.REGIST_FLAG
+            WHEN '0' THEN
+            '未认证'
+            WHEN '1' THEN
+            '自动认证'
+            WHEN '2' THEN
+            '手动认证'
+            ELSE
+            '未认证'
+            END REGIST_NAME,
+        GROUP_CONCAT(ut.TAG_NAME) TAG_NAME,
+        allu.CREATED_TIME,
+        allu.IDENTITY_NO,
+        allu.MOBILE,
+        allu.REAL_NAME,
+        allu.registTime,
+        allu.ALL_DEPT_NAMES
+        FROM
+        (
+        SELECT
+        eu.ID,
+        eu.CREATED_TIME,
+        eu.IDENTITY_NO,
+        eu.MOBILE,
+        eu.REAL_NAME,
+        eu.REGISTER_TIME as registTime,
+        eu.ALL_DEPT_NAMES
+        FROM
+        epdc_user eu
+        WHERE
+        eu.ID IN
+        <foreach collection="userIdList" index="index" item="id" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+        ) allu
+        LEFT JOIN epdc_party_members pm ON pm.IDENTITY_NO = allu.IDENTITY_NO
+        AND pm.REAL_NAME = allu.REAL_NAME
+        LEFT JOIN epdc_party_tag_relation pt ON pm.ID = pt.PARTY_ID
+        LEFT JOIN epdc_user_tag ut ON pt.TAG_ID = ut.ID
+        AND ut.DEL_FLAG = '0'
+        GROUP BY
+        allu.ID
+        ORDER BY
+        allu.registTime DESC
+    </select>
     <!--删除党员时候校验是否被认证-->
     <select id="selectCountByIdentity" resultType="Integer">
         SELECT
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml
index ac0ecd951..f6c9c96a8 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml
@@ -1211,7 +1211,7 @@
                 WHERE
                 DEL_FLAG = '0'
                 AND AUTHENTICATED_TYPE IN ( '0', '1' )
-                 <if test="endTime != ''">
+                 <if test="endTime != null and endTime != ''">
                     and DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') &lt;= #{endTime}
                     </if>
                 AND USER_ID = uu.ID
@@ -1228,7 +1228,7 @@
         WHERE
         DEL_FLAG = '0'
         AND AUTHENTICATED_TYPE IN ( '0', '1' )
-        <if test="endTime != ''">
+        <if test="endTime != null and endTime != ''">
         and DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') &lt;= #{endTime}
     </if>
         AND USER_ID = uu.ID
@@ -1246,7 +1246,7 @@
         DEL_FLAG = '0'
         AND AUTHENTICATED_TYPE IN ( '0', '1' )
         AND AUTHENTICATED_FLAG = '1'
-         <if test="endTime != ''">
+         <if test="endTime != null and endTime != ''">
         and DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') &lt;= #{endTime}
     </if>
         AND USER_ID = uu.ID
@@ -1262,7 +1262,8 @@
         FROM
         epdc_user uu
         where  uu.DEL_FLAG = '0'
-        <if test="startTime != '' and endTime != ''">and DATE_FORMAT(uu.CREATED_TIME,'%Y-%m-%d') between #{startTime} and #{endTime}</if>
+        <if test="startTime != null and startTime != '' ">and DATE_FORMAT(uu.UPDATED_TIME,'%Y-%m-%d') >= #{startTime}</if>
+        <if test="endTime != null and endTime != '' "> <![CDATA[ and DATE_FORMAT(uu.UPDATED_TIME,'%Y-%m-%d') <= ]]> #{endTime}</if>
         <if test="realName != '' and realName != null">and uu.real_name like '%${realName}%'</if>
         <if test="nickname != '' and nickname != null">and uu.NICKNAME like '%${nickname}%'</if>
         <if test="mobile != '' and mobile != null">and uu.mobile like '%${mobile}%'</if>