Merge remote-tracking branch 'remotes/origin/dev_data_sync_user_org_for_yt' into 烟台-政务master

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgServiceImpl.java

@@ -1,7 +1,6 @@
 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;
@@ -11,7 +10,6 @@ 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;
@@ -64,7 +62,7 @@ public class DataSyncUserAndOrgServiceImpl implements DataSyncUserAndOrgService
     public Boolean yanTaiSyncUser(String organizationId) {
         String customerId = YT_CUSTOMER_ID;
         // 先删除 旧数据
-        Integer delSize = NumConstant.ZERO;
+        Integer delSize = null;
         do {
             delSize = dataSyncUserDataService.deleteByCustomerId(customerId);
         }while (null != delSize && delSize == NumConstant.ONE_THOUSAND);
@@ -92,7 +90,6 @@ public class DataSyncUserAndOrgServiceImpl implements DataSyncUserAndOrgService
                                 entity.setStatus(NumConstant.ZERO_STR);
                                 entity.setStaffId("");
                             }else {
-                                CustomerStaffInfoCacheResult staffInfo1 = CustomerStaffRedis.getStaffInfo(customerId, staffInfo.getUserId());
                                 entity.setStatus(NumConstant.ONE_STR);
                                 entity.setStaffId(staffInfo.getUserId());
                             }
@@ -112,7 +109,7 @@ public class DataSyncUserAndOrgServiceImpl implements DataSyncUserAndOrgService
     @Override
     public Boolean yanTaiSyncOrg(String organizationId) {
         // 先删除 旧数据
-        Integer delSize = NumConstant.ZERO;
+        Integer delSize = null;
         do {
             delSize = dataSyncOrgDataService.deleteByCustomerId(YT_CUSTOMER_ID);
         }while (null != delSize && delSize == NumConstant.ONE_THOUSAND);

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/DataSyncUserDataServiceImpl.java

@@ -3,15 +3,14 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.yantai.DataSyncUserDataDao;
 import com.epmet.dto.DataSyncUserDataDTO;
 import com.epmet.entity.yantai.DataSyncUserDataEntity;
 import com.epmet.service.DataSyncUserDataService;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -82,7 +81,7 @@ public class DataSyncUserDataServiceImpl extends BaseServiceImpl<DataSyncUserDat
 
     @Override
     public Integer deleteByCustomerId(String customerId) {
-        return null;
+        return baseDao.deleteByCustomerId(customerId);
     }
 
 }