diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataOrgChangeEventListener.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataOrgChangeEventListener.java
index d1b1bf0912..654246351c 100644
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataOrgChangeEventListener.java
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataOrgChangeEventListener.java
@@ -6,7 +6,6 @@ import com.epmet.commons.rocketmq.messages.OrgOrStaffMQMsg;
 import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.distributedlock.DistributedLock;
 import com.epmet.commons.tools.exception.ExceptionUtils;
-import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.redis.RedisKeys;
 import com.epmet.commons.tools.redis.RedisUtils;
 import com.epmet.commons.tools.utils.SpringContextUtils;
@@ -106,12 +105,9 @@ public class OpenDataOrgChangeEventListener implements MessageListenerConcurrent
                 SpringContextUtils.getBean(GridInfoPingyinService.class).exractGrid(extractFormDto);
             }
 
-        } catch (RenException e) {
-            // 如果是我们手动抛出的异常，说明在业务可控范围内。目前不需要MQ重试
-            logger.error("【开放数据事件监听器】-组织信息变更-同步信息到中间库失败:".concat(ExceptionUtils.getErrorStackTrace(e)));
         } catch (Exception e) {
             // 不是我们自己抛出的异常，可以让MQ重试
-            logger.error("【开放数据事件监听器】-组织信息变更-同步信息到中间库失败:".concat(ExceptionUtils.getErrorStackTrace(e)));
+            logger.warn("【开放数据事件监听器】-组织信息变更-同步信息到中间库失败:".concat(ExceptionUtils.getErrorStackTrace(e)));
             throw e;
         } finally {
             distributedLock.unLock(lock);
diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataPatrolChangeEventListener.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataPatrolChangeEventListener.java
index 5c3bbb4404..44ac2386a5 100644
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataPatrolChangeEventListener.java
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataPatrolChangeEventListener.java
@@ -9,7 +9,6 @@ import com.epmet.commons.tools.distributedlock.DistributedLock;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.exception.ExceptionUtils;
-import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.redis.RedisKeys;
 import com.epmet.commons.tools.redis.RedisUtils;
 import com.epmet.commons.tools.utils.SpringContextUtils;
@@ -109,12 +108,9 @@ public class OpenDataPatrolChangeEventListener implements MessageListenerConcurr
                 throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"消费失败!");
             }
 
-        } catch (RenException e) {
-            // 如果是我们手动抛出的异常，说明在业务可控范围内。目前不需要MQ重试
-            logger.error("【开放数据事件监听器】-巡查记录信息变更-失败:".concat(ExceptionUtils.getErrorStackTrace(e)));
         } catch (Exception e) {
             // 不是我们自己抛出的异常，可以让MQ重试
-            logger.error("【开放数据事件监听器】-巡查记录信息变更-失败:".concat(ExceptionUtils.getErrorStackTrace(e)));
+            logger.warn("【开放数据事件监听器】-巡查记录信息变更-失败:".concat(ExceptionUtils.getErrorStackTrace(e)));
             throw e;
         } finally {
             distributedLock.unLock(lock);
diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataProjectChangeEventListener.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataProjectChangeEventListener.java
index 1912fc95a3..77697c2a2f 100644
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataProjectChangeEventListener.java
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataProjectChangeEventListener.java
@@ -5,7 +5,6 @@ import com.epmet.commons.rocketmq.constants.MQUserPropertys;
 import com.epmet.commons.rocketmq.messages.DisputeProcessMQMsg;
 import com.epmet.commons.tools.distributedlock.DistributedLock;
 import com.epmet.commons.tools.exception.ExceptionUtils;
-import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.redis.RedisKeys;
 import com.epmet.commons.tools.redis.RedisUtils;
 import com.epmet.commons.tools.utils.ConvertUtils;
@@ -77,12 +76,9 @@ public class OpenDataProjectChangeEventListener implements MessageListenerConcur
                     30L, 30L, TimeUnit.SECONDS);
             //SpringContextUtils.getBean(BaseDisputeProcessService.class).getEventinfo(formDTO);
             SpringContextUtils.getBean(EventreportPingyinService.class).getEventInfo(formDTO);
-        } catch (RenException e) {
-            // 如果是我们手动抛出的异常，说明在业务可控范围内。目前不需要MQ重试
-            logger.error("【开放数据事件监听器】-项目信息变更-上报项目信息失败:".concat(ExceptionUtils.getErrorStackTrace(e)));
         } catch (Exception e) {
             // 不是我们自己抛出的异常，可以让MQ重试
-            logger.error("【开放数据事件监听器】-项目信息变更-上报项目信息失败:".concat(ExceptionUtils.getErrorStackTrace(e)));
+            logger.warn("【开放数据事件监听器】-项目信息变更-上报项目信息失败:".concat(ExceptionUtils.getErrorStackTrace(e)));
             throw e;
         } finally {
             distributedLock.unLock(lock);
diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataStaffChangeEventListener.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataStaffChangeEventListener.java
index b2d9bd4976..1cf3a8f688 100644
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataStaffChangeEventListener.java
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataStaffChangeEventListener.java
@@ -6,12 +6,10 @@ import com.epmet.commons.rocketmq.messages.OrgOrStaffMQMsg;
 import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.distributedlock.DistributedLock;
 import com.epmet.commons.tools.exception.ExceptionUtils;
-import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.redis.RedisKeys;
 import com.epmet.commons.tools.redis.RedisUtils;
 import com.epmet.commons.tools.utils.SpringContextUtils;
 import com.epmet.opendata.dto.form.StaffBaseInfoFormDTO;
-import com.epmet.opendata.service.ExUserService;
 import com.epmet.opendata.service.GridstaffInfoPingyinService;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyContext;
@@ -22,7 +20,6 @@ import org.redisson.api.RLock;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
@@ -90,12 +87,9 @@ public class OpenDataStaffChangeEventListener implements MessageListenerConcurre
             SpringContextUtils.getBean(ExUserService.class).getStaffBaseInfo(dto);*/
             dto.setStaffIdList(obj.getStaffIdList());
             SpringContextUtils.getBean(GridstaffInfoPingyinService.class).getStaffBaseInfo(dto);
-        } catch (RenException e) {
-            // 如果是我们手动抛出的异常，说明在业务可控范围内。目前不需要MQ重试
-            logger.error("【开放数据事件监听器】-工作人员信息变更-初始化客户组织失败:".concat(ExceptionUtils.getErrorStackTrace(e)));
         } catch (Exception e) {
             // 不是我们自己抛出的异常，可以让MQ重试
-            logger.error("【开放数据事件监听器】-工作人员信息变更-初始化客户组织失败:".concat(ExceptionUtils.getErrorStackTrace(e)));
+            logger.warn("【开放数据事件监听器】-工作人员信息变更-初始化客户组织失败:".concat(ExceptionUtils.getErrorStackTrace(e)));
             throw e;
         } finally {
             distributedLock.unLock(lock);
diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/EventreportPingyinServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/EventreportPingyinServiceImpl.java
index 0fe4ff1620..624b89cfbb 100755
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/EventreportPingyinServiceImpl.java
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/EventreportPingyinServiceImpl.java
@@ -21,7 +21,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -135,7 +134,7 @@ public class EventreportPingyinServiceImpl extends BaseServiceImpl<EventreportPi
             entity.setLng(item.getLng());
             entity.setLat(item.getLat());
             entity.setIsDel("N");
-            entity.setUpdateTime(new Date());
+            entity.setUpdateTime(null);
 
             //业务不包含 一级分类里 如果是03 矛盾纠纷 则涉及人数写2（目前业务不支持 所以应产品需求 填2）
             if ("03".equals(item.getParentEventCategory())) {
diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridInfoPingyinServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridInfoPingyinServiceImpl.java
index 9958530251..d2db4b070e 100755
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridInfoPingyinServiceImpl.java
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridInfoPingyinServiceImpl.java
@@ -32,7 +32,6 @@ import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 
 
@@ -187,7 +186,7 @@ public class GridInfoPingyinServiceImpl extends BaseServiceImpl<GridInfoPingyinD
             entity.setGridName(ag.getGridName());
             entity.setGridLevel("07");
             entity.setIsDel("N");
-            entity.setUpdateTime(new Date());
+            entity.setUpdateTime(null);
             if (ag.getLatitude().length() > 10) {
                 entity.setLat(new BigDecimal(ag.getLatitude().substring(0, 10)));
             } else {
@@ -256,7 +255,7 @@ public class GridInfoPingyinServiceImpl extends BaseServiceImpl<GridInfoPingyinD
         if (StringUtils.isNotBlank(formDTO.getOldCode()) && !formDTO.getOldCode().equals(entity.getGridCode())){
             GridInfoPingyinEntity gridInfoEntity = new GridInfoPingyinEntity();
             gridInfoEntity.setGridCode(entity.getGridCode());
-            gridInfoEntity.setUpdateTime(new Date());
+            gridInfoEntity.setUpdateTime(null);
             LambdaUpdateWrapper<GridInfoPingyinEntity> updateWrapper = new LambdaUpdateWrapper<>();
             updateWrapper.eq(GridInfoPingyinEntity::getGridCode,formDTO.getOldCode());
             int update = baseDao.update(gridInfoEntity, updateWrapper);
@@ -265,7 +264,7 @@ public class GridInfoPingyinServiceImpl extends BaseServiceImpl<GridInfoPingyinD
 
             GridstaffInfoPingyinEntity staffInfo = new GridstaffInfoPingyinEntity();
             staffInfo.setGridCode(entity.getGridCode());
-            staffInfo.setUpdateTime(new Date());
+            staffInfo.setUpdateTime(null);
 
             LambdaUpdateWrapper<GridstaffInfoPingyinEntity> staffInfoWrapper = new LambdaUpdateWrapper<>();
             staffInfoWrapper.eq(GridstaffInfoPingyinEntity::getGridCode,formDTO.getOldCode());
@@ -274,7 +273,7 @@ public class GridInfoPingyinServiceImpl extends BaseServiceImpl<GridInfoPingyinD
 
             GridstaffWorkInfoPingyinEntity workInfo = new GridstaffWorkInfoPingyinEntity();
             workInfo.setGridCode(entity.getGridCode());
-            workInfo.setUpdateTime(new Date());
+            workInfo.setUpdateTime(null);
 
             LambdaUpdateWrapper<GridstaffWorkInfoPingyinEntity> workInfoWrapper = new LambdaUpdateWrapper<>();
             workInfoWrapper.eq(GridstaffWorkInfoPingyinEntity::getGridCode,formDTO.getOldCode());
@@ -283,7 +282,7 @@ public class GridInfoPingyinServiceImpl extends BaseServiceImpl<GridInfoPingyinD
 
             EventreportPingyinEntity eventEntity = new EventreportPingyinEntity();
             eventEntity.setGridCode(entity.getGridCode());
-            eventEntity.setUpdateTime(new Date());
+            eventEntity.setUpdateTime(null);
 
             LambdaUpdateWrapper<EventreportPingyinEntity> eventWrapper = new LambdaUpdateWrapper<>();
             eventWrapper.eq(EventreportPingyinEntity::getGridCode,formDTO.getOldCode());
diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridstaffInfoPingyinServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridstaffInfoPingyinServiceImpl.java
index cb81df537d..34ea9c0da5 100755
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridstaffInfoPingyinServiceImpl.java
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridstaffInfoPingyinServiceImpl.java
@@ -26,7 +26,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -138,7 +137,7 @@ public class GridstaffInfoPingyinServiceImpl extends BaseServiceImpl<GridstaffIn
             GridstaffInfoPingyinEntity gs = baseDao.selectByCodeAndStaffId(r.getCode(), r.getStaffId());
             log.info(String.format("网格工作人员信息同步，当前操作人员信息，姓名:%s   staffId:%s", entity.getNickName(), entity.getGridUserId()));
             if (null != gs) {
-                entity.setUpdateTime(new Date());
+                entity.setUpdateTime(null);
                 baseDao.edit(entity);
             } else {
                 insert(entity);
diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridstaffWorkInfoPingyinServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridstaffWorkInfoPingyinServiceImpl.java
index 01ba8bd7b6..32511e267a 100755
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridstaffWorkInfoPingyinServiceImpl.java
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridstaffWorkInfoPingyinServiceImpl.java
@@ -73,6 +73,10 @@ public class GridstaffWorkInfoPingyinServiceImpl extends BaseServiceImpl<Gridsta
                 throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode());
             }
             data.forEach(d -> {
+                if (StringUtils.isBlank(d.getGridId())){
+                    log.warn("data is null string:{}",JSON.toJSONString(d));
+                    return;
+                }
                 GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(d.getGridId());
                 if (null == gridInfo) {
                     log.warn("未查询到网格信息：" + d.getGridId());
@@ -131,7 +135,7 @@ public class GridstaffWorkInfoPingyinServiceImpl extends BaseServiceImpl<Gridsta
         entity.setWorkResult(NumConstant.ONE == record.getIsNormal() ? "Y" : "N");
         entity.setWorkType(record.getWorkTypeSecondCode());
         entity.setRecoredInsertTime(record.getCreatedTime());
-        entity.setUpdateTime(record.getUpdatedTime());
+        entity.setUpdateTime(null);
         entity.setId(null);
         entity.setIsDel("N");
         return entity;
diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/EventreportPingyinDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/EventreportPingyinDao.xml
index 6688632c7b..c509553083 100755
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/EventreportPingyinDao.xml
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/EventreportPingyinDao.xml
@@ -40,8 +40,8 @@
         <result property="recoredInsertTime" column="recored_insert_time"/>
     </resultMap>
     <delete id="deleteAllData">
-        DELETE FROM eventreport_pingyin
+        update eventreport_pingyin SET is_del = 'Y'
     </delete>
 
 
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/GridInfoPingyinDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/GridInfoPingyinDao.xml
index c2eeb0baa9..9bbb6ca663 100755
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/GridInfoPingyinDao.xml
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/GridInfoPingyinDao.xml
@@ -4,12 +4,12 @@
 <mapper namespace="com.epmet.opendata.dao.GridInfoPingyinDao">
 
     <delete id="deleteAllAgencyData">
-        delete from grid_info_pingyin where grid_level !='07'
+        update grid_info_pingyin set is_del = 'Y' where grid_level !='07'
     </delete>
 
 
     <delete id="deleteAllGridData">
-        delete from grid_info_pingyin where grid_level ='07'
+        update grid_info_pingyin set is_del = 'Y' where grid_level ='07'
     </delete>
 
     <select id="selectByGridCode" parameterType="java.lang.String" resultType="com.epmet.opendata.entity.GridInfoPingyinEntity">
@@ -22,13 +22,12 @@
        set grid_name = #{gridName},
            grid_level = #{gridLevel},
            lng = #{lng},
-           lat = #{lat},
-           update_time = now()
+           lat = #{lat}
         where grid_code = #{gridCode} and is_del = 'N'
     </update>
 
     <update id="deleteByCode">
-        update grid_info_pingyin set is_del = 'Y',update_time = now()
+        update grid_info_pingyin set is_del = 'Y'
         where grid_code = #{gridCode}
     </update>
 </mapper>
diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/GridstaffInfoPingyinDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/GridstaffInfoPingyinDao.xml
index 81143e89e0..b13583aad1 100755
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/GridstaffInfoPingyinDao.xml
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/GridstaffInfoPingyinDao.xml
@@ -16,7 +16,7 @@
     </update>
 
     <delete id="del">
-        delete from gridstaff_info_pingyin
+        UPDATE gridstaff_info_pingyin set IS_LEAVE = 'Y'
     </delete>
 
     <select id="selectByCodeAndStaffId" resultType="com.epmet.opendata.entity.GridstaffInfoPingyinEntity">
@@ -35,4 +35,4 @@
         LIMIT 1
     </select>
 
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/GridstaffWorkInfoPingyinDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/GridstaffWorkInfoPingyinDao.xml
index ea3bc11030..0cba8e6cf6 100755
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/GridstaffWorkInfoPingyinDao.xml
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/GridstaffWorkInfoPingyinDao.xml
@@ -19,8 +19,8 @@
         <result property="recoredInsertTime" column="recored_insert_time"/>
     </resultMap>
     <delete id="delAllGridStaffWorkInfoPY">
-        delete from gridstaff_work_info_pingyin LIMIT 1000
+        update gridstaff_work_info_pingyin SET is_del = 'Y' LIMIT 1000
     </delete>
 
 
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
index 976ab930d6..9373743976 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
@@ -1205,7 +1205,7 @@
     <select id="getListIcResiUserDTO" parameterType="map" resultType="com.epmet.dto.IcResiUserDTO">
         select id, NAME,MOBILE
         from ic_resi_user
-        WHERE  DEL_FLAG = '0'
+        WHERE 1=1
         <foreach collection="icResiUserIdList" item="icResiUserId" open="AND (" separator="or" close=")">
            id = #{icResiUserId}
         </foreach>
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserDao.xml
index 605350bde2..9bca7b1bf5 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserDao.xml
@@ -35,7 +35,7 @@
             IFNULL(resi.ID,"") AS resiId,
             IFNULL(CONCAT(resi.SURNAME,resi.NAME),"") AS userRealName,
             IFNULL(relation.GRID_ID,"") AS gridId,
-            IFNULL(resi.id_num,'')AS idNum
+            IFNULL(wechat.id_num,'')AS idNum
             FROM
             USER user
             LEFT JOIN