diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgServiceImpl.java
index 4261969097..6b81da281f 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgServiceImpl.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgServiceImpl.java
@@ -1,16 +1,22 @@
 package com.epmet.controller.yantai;
 
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
+import com.epmet.commons.tools.redis.common.bean.CustomerStaffInfoDTOCache;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.api.yt.OrgData;
+import com.epmet.commons.tools.utils.api.yt.UserData;
 import com.epmet.commons.tools.utils.api.yt.YantaiApi;
 import com.epmet.dao.yantai.DataSyncOrgDataDao;
 import com.epmet.dao.yantai.DataSyncUserDataDao;
+import com.epmet.dto.CustomerStaffDTO;
 import com.epmet.dto.form.yantai.YtUserPageFormDTO;
 import com.epmet.dto.result.yantai.DataSyncOrgDataDTO;
 import com.epmet.dto.result.yantai.YtUserPageResDTO;
 import com.epmet.entity.yantai.DataSyncOrgDataEntity;
+import com.epmet.entity.yantai.DataSyncUserDataEntity;
 import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.service.DataSyncOrgDataService;
 import com.epmet.service.DataSyncUserDataService;
@@ -56,9 +62,46 @@ public class DataSyncUserAndOrgServiceImpl implements DataSyncUserAndOrgService
      */
     @Override
     public Boolean yanTaiSyncUser(String organizationId) {
-
-//        List<UserData> data = YantaiApi.getUserByOuGuid(organizationId);
-        //todo 更新或插入数据
+        String customerId = "45687aa479955f9d06204d415238f7cc";
+        // 缓存初始化staffs
+        epmetUserOpenFeignClient.allCustomerStaffInCache(customerId);
+        Integer no = NumConstant.ONE;
+        Integer size;
+        do {
+            // 分批获取org
+            PageInfo<com.epmet.dto.DataSyncOrgDataDTO> pageInfo = PageHelper.startPage(no, NumConstant.ONE_HUNDRED).doSelectPageInfo(() -> dataSyncOrgDataDao.getAllList(customerId));
+            size = pageInfo.getList().size();
+            if (CollectionUtils.isNotEmpty(pageInfo.getList())){
+                List<DataSyncUserDataEntity> needInsert = new ArrayList<>();
+                pageInfo.getList().forEach(org -> {
+                    // 根据org查用户
+                    List<UserData> data = YantaiApi.getUserByOuGuid(org.getOrganizationId());
+                    if (CollectionUtils.isNotEmpty(data)){
+                        for (UserData u : data) {
+                            CustomerStaffInfoDTOCache staffInfo = CustomerStaffRedis.getStaffInfoByMobile(customerId, u.getMobileTelephoneNumber());
+                            DataSyncUserDataEntity entity = ConvertUtils.sourceToTarget(u, DataSyncUserDataEntity.class);
+                            entity.setCustomerId(customerId);
+                            entity.setRemark("");
+                            if (null == staffInfo){
+                                entity.setStatus(NumConstant.ZERO_STR);
+                                entity.setOrganizationId("");
+                                entity.setStaffId("");
+                            }else {
+                                CustomerStaffInfoCacheResult staffInfo1 = CustomerStaffRedis.getStaffInfo(customerId, staffInfo.getUserId());
+                                entity.setStatus(NumConstant.ONE_STR);
+                                entity.setOrganizationId(null == staffInfo1 ? "" : staffInfo1.getAgencyId());
+                                entity.setStaffId(staffInfo.getUserId());
+                            }
+                            needInsert.add(entity);
+                        }
+                    }
+                });
+                dataSyncUserDataService.insertBatch(needInsert,NumConstant.FIVE_HUNDRED);
+            }
+            no++;
+        }while (size == NumConstant.ONE_HUNDRED);
+        // 删除staffs缓存
+        CustomerStaffRedis.delAllCustomerStaff(customerId);
         return false;
     }
 
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/yantai/DataSyncOrgDataDao.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/yantai/DataSyncOrgDataDao.java
index edad699db9..b0b0529b62 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/yantai/DataSyncOrgDataDao.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/yantai/DataSyncOrgDataDao.java
@@ -22,4 +22,6 @@ public interface DataSyncOrgDataDao extends BaseDao<DataSyncOrgDataEntity> {
      * @return
      */
     List<DataSyncOrgDataDTO> queryList(@Param("pid") String pid);
+
+    List<com.epmet.dto.DataSyncOrgDataDTO> getAllList(@Param("customerId") String customerId);
 }
\ No newline at end of file
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/yantai/DataSyncOrgDataDao.xml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/yantai/DataSyncOrgDataDao.xml
index 6f81c501f3..14931417d7 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/yantai/DataSyncOrgDataDao.xml
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/yantai/DataSyncOrgDataDao.xml
@@ -46,4 +46,10 @@
         </if>
         order by d.ORDER_NUMBER asc
     </select>
+    <select id="getAllList" resultType="com.epmet.dto.DataSyncOrgDataDTO">
+        select * from data_sync_org_data
+        where del_flag = '0'
+        and CUSTOMER_ID = #{customerId}
+        order by ORDER_NUMBER asc
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java
index 657e590d64..1d229ba369 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java
@@ -61,6 +61,8 @@ import com.epmet.service.GovStaffRoleService;
 import com.epmet.service.StaffRoleService;
 import com.epmet.service.UserService;
 import com.epmet.util.ModuleConstant;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
@@ -1159,10 +1161,10 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
         Integer no = NumConstant.ONE;
         Integer size;
         do {
-            List<CustomerStaffDTO> customerStaffs = baseDao.getAllStaffByCustomerId(customerId);
-            size = customerStaffs.size();
-            if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(customerStaffs)){
-                customerStaffs.forEach(c -> {
+            PageInfo<CustomerStaffDTO> pageInfo = PageHelper.startPage(no, NumConstant.ONE_HUNDRED).doSelectPageInfo(() -> baseDao.getAllStaffByCustomerId(customerId));
+            size = pageInfo.getList().size();
+            if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(pageInfo.getList())){
+                pageInfo.getList().forEach(c -> {
                     String key = RedisKeys.getCustomerStaffInfoKeyByMobile(customerId, c.getMobile());
                     Map<String, Object> map = BeanUtil.beanToMap(c, false, true);
                     redisUtils.hMSet(key,map);