Merge branch 'master-调整队列' into developer

# Conflicts:
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/DealSyncOperationApiServiceImpl.java

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/DealSyncOperationApiServiceImpl.java

@@ -937,6 +937,8 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
             this.unlockTask(wxEnterpriseId) ;
             this.cleanDiffrence(wxEnterpriseId, taskId);
             logger.info("同步通讯录完成");
+            String conectkey = "get_follow_user_list:"+wxEnterpriseId ;
+            RedisUtil.delCache(conectkey) ;
             RedisUtil.unlock(key);
         }
         return true ;

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffApiServiceImpl.java

@@ -393,7 +393,7 @@ public class StaffApiServiceImpl implements StaffApiService {
                 wxUserIdsList = qywxUserApiService.listCorpExternalUser(qwDTO.getThirdCorpid(), config.getWxSuiteid());
             }
             if(isSyncDepart) {
-                RedisUtil.setCache(key,wxUserIdsList);
+                RedisUtil.setCache(key,wxUserIdsList,60*60L);
             }
         }
         if (CollUtil.isNotEmpty(wxUserIdsList) && wxUserIdsList.contains(userId)) {